Merge branch 'develop' into yr/develop

CnCNet · Feb 19, 2025 · b81084f · b81084f
2 parents 4163026 + 4498520
commit b81084f
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs
@@ -540,6 +540,8 @@ protected void ListMaps()
             var isFavoriteMapsSelected = IsFavoriteMapsSelected();
             var maps = GetSortedGameModeMaps();
 
+            bool gameModeMapChanged = false;
+
             for (int i = 0; i < maps.Count; i++)
             {
                 var gameModeMap = maps[i];
@@ -587,11 +589,17 @@ protected void ListMaps()
 
                 // Preserve the selected map
                 if (gameModeMap == GameModeMap)
+                {
                     mapIndex = i - skippedMapsCount;
+                    gameModeMapChanged = false;
+                }
 
                 // Preserve the selected map, even if the game mode has changed
                 if (mapIndex == -1 && (gameModeMap?.Map?.Equals(GameModeMap?.Map) ?? false))
+                {
                     mapIndex = i - skippedMapsCount;
+                    gameModeMapChanged = true;
+                }
             }
 
             if (mapIndex > -1)
@@ -602,8 +610,10 @@ protected void ListMaps()
             }
 
             lbGameModeMapList.SelectedIndexChanged += LbGameModeMapList_SelectedIndexChanged;
+
             // Trigger the event manually to update GameModeMap
-            LbGameModeMapList_SelectedIndexChanged();
+            if (gameModeMapChanged)
+                LbGameModeMapList_SelectedIndexChanged();
         }
 
         protected abstract int GetDefaultMapRankIndex(GameModeMap gameModeMap);