Fix crash on unknown LAN games (CnCNet#560)

* Fix crash on unknown LAN games * Fix incorrect culture in game identifier comparison
Flactine · Oct 4, 2024 · 44f72f5 · 44f72f5
1 parent 982fde3
commit 44f72f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/DXMainClient/DXGUI/Multiplayer/GameListBox.cs b/DXMainClient/DXGUI/Multiplayer/GameListBox.cs
@@ -128,7 +128,7 @@ private IEnumerable<GenericHostedGame> GetSortedGames()
             var sortedGames =
                 HostedGames
                     .OrderBy(hg => hg.Locked)
-                    .ThenBy(hg => string.Equals(hg.Game.InternalName, localGameIdentifier, StringComparison.CurrentCultureIgnoreCase))
+                    .ThenBy(hg => string.Equals(hg.Game.InternalName, localGameIdentifier, StringComparison.InvariantCultureIgnoreCase))
                     .ThenBy(hg => hg.GameVersion != ProgramConstants.GAME_VERSION)
                     .ThenBy(hg => hg.Passworded);
 

diff --git a/DXMainClient/Domain/Multiplayer/LAN/HostedLANGame.cs b/DXMainClient/Domain/Multiplayer/LAN/HostedLANGame.cs
@@ -36,6 +36,8 @@ public bool SetDataFromStringArray(GameCollection gc, string[] parameters)
             GameVersion = parameters[1];
             Incompatible = GameVersion != ProgramConstants.GAME_VERSION;
             Game = gc.GameList.Find(g => g.InternalName.ToUpperInvariant() == parameters[2]);
+            if (Game == null)
+                return false;
             Map = parameters[3];
             GameMode = parameters[4];
             LoadedGameID = parameters[5];