From c73f37507f23b2705eab820994814e52de75d9bf Mon Sep 17 00:00:00 2001
From: mathiskirchner <mathis.kirchner.mk@gmail.com>
Date: Wed, 24 Dec 2025 13:05:49 +0100
Subject: [PATCH] put isLoading in existing setState and move mounted check up

---
 .../widgets/player_selection.dart             | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/lib/presentation/widgets/player_selection.dart b/lib/presentation/widgets/player_selection.dart
index 1e283fb..fda1da1 100644
--- a/lib/presentation/widgets/player_selection.dart
+++ b/lib/presentation/widgets/player_selection.dart
@@ -53,37 +53,35 @@ class _PlayerSelectionState extends State<PlayerSelection> {
       db.playerDao.getAllPlayers(),
       Future.delayed(minimumSkeletonDuration),
     ]).then((results) => results[0] as List<Player>);
-    _allPlayersFuture.then((loadedPlayers) {
-      setState(() {
-        // If a list of available players is provided, use that list.
-        if (widget.availablePlayers.isNotEmpty) {
-          widget.availablePlayers.sort((a, b) => a.name.compareTo(b.name));
-          allPlayers = [...widget.availablePlayers];
-          suggestedPlayers = [...allPlayers];
-
-          if (widget.initialSelectedPlayers != null) {
-            // Ensures that only players available for selection are pre-selected.
-            selectedPlayers = widget.initialSelectedPlayers!
-                .where(
-                  (p) => widget.availablePlayers.any(
-                    (available) => available.id == p.id,
-                  ),
-                )
-                .toList();
-          }
-        } else {
-          // Otherwise, use the loaded players from the database.
-          loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
-          allPlayers = [...loadedPlayers];
-          suggestedPlayers = [...loadedPlayers];
-        }
-      });
-      if (mounted) {
+    if (mounted) {
+      _allPlayersFuture.then((loadedPlayers) {
         setState(() {
+          // If a list of available players is provided, use that list.
+          if (widget.availablePlayers.isNotEmpty) {
+            widget.availablePlayers.sort((a, b) => a.name.compareTo(b.name));
+            allPlayers = [...widget.availablePlayers];
+            suggestedPlayers = [...allPlayers];
+
+            if (widget.initialSelectedPlayers != null) {
+              // Ensures that only players available for selection are pre-selected.
+              selectedPlayers = widget.initialSelectedPlayers!
+                  .where(
+                    (p) => widget.availablePlayers.any(
+                      (available) => available.id == p.id,
+                    ),
+                  )
+                  .toList();
+            }
+          } else {
+            // Otherwise, use the loaded players from the database.
+            loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
+            allPlayers = [...loadedPlayers];
+            suggestedPlayers = [...loadedPlayers];
+          }
           isLoading = false;
         });
-      }
-    });
+      });
+    }
   }
 
   @override