Fix game starts even when cancelling "show roles" dialog

evgfilim1 · Apr 12, 2024 · cf22338 · cf22338
1 parent faa27f6
commit cf22338
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/screens/choose_roles_screen.dart b/lib/screens/choose_roles_screen.dart
@@ -193,7 +193,6 @@ class _ChooseRolesScreenState extends State<ChooseRolesScreen> {
       showSnackBar(context, const SnackBar(content: Text("Для продолжения исправьте ошибки")));
       return;
     }
-    final controller = context.read<GameController>();
     final newRoles = _randomizeRoles();
     if (newRoles == null) {
       showSnackBar(
@@ -202,10 +201,6 @@ class _ChooseRolesScreenState extends State<ChooseRolesScreen> {
       );
       return;
     }
-    controller
-      ..roles = newRoles
-      ..nicknames = _chosenNicknames
-      ..startNewGame();
     final showRoles = await showDialog<bool>(
       context: context,
       builder: (context) => const ConfirmationDialog(
@@ -220,6 +215,10 @@ class _ChooseRolesScreenState extends State<ChooseRolesScreen> {
     if (showRoles == null) {
       return;
     }
+    context.read<GameController>()
+      ..roles = newRoles
+      ..nicknames = _chosenNicknames
+      ..startNewGame();
     if (showRoles) {
       await Navigator.pushNamed(context, "/roles");
       if (!context.mounted) {