Merge branch 'soru/fix-regressions' into 'main'

fix: Emote settings and discovery fallback See merge request famedly/fluffychat!366
2021-02-02 13:08:24 +00:00 · 2021-02-02 13:08:24 +00:00 · fa1b58328a
commit fa1b58328a
parent 5dd4a587d1 b539d26b69
2 changed files with 3 additions and 3 deletions
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@ -161,8 +161,8 @@ class FluffyRoutes {
                return ViewData(
                  leftView: (_) => Settings(),
                  mainView: (_) => EmotesSettings(
-                    room: (settings.arguments as Map)['room'],
-                    stateKey: (settings.arguments as Map)['stateKey'],
+                    room: ((settings.arguments ?? {}) as Map)['room'],
+                    stateKey: ((settings.arguments ?? {}) as Map)['stateKey'],
                  ),
                );
              case 'ignore':