Fix crash when joining LAN game

CnCNet · Mar 29, 2020 · 02e82ab · 02e82ab
1 parent 651a656
commit 02e82ab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs
@@ -347,7 +347,7 @@ protected override void UpdateDiscordPresence(bool resetTimer = false)
             if (discordHandler == null)
                 return;
 
-            PlayerInfo player = Players.Find(p => p.Name == ProgramConstants.PLAYERNAME);
+            PlayerInfo player = FindLocalPlayer();
             if (player == null || Map == null || GameMode == null)
                 return;
             string side = "";
@@ -1210,7 +1210,7 @@ protected override void WriteSpawnIniAdditions(IniFile iniFile)
             iniFile.SetIntValue("Settings", "GameID", UniqueGameID);
             iniFile.SetBooleanValue("Settings", "Host", IsHost);
 
-            PlayerInfo localPlayer = Players.Find(p => p.Name == ProgramConstants.PLAYERNAME);
+            PlayerInfo localPlayer = FindLocalPlayer();
 
             if (localPlayer == null)
                 return;

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs
@@ -133,6 +133,8 @@ protected Map Map
         protected List<PlayerInfo> Players = new List<PlayerInfo>();
         protected List<PlayerInfo> AIPlayers = new List<PlayerInfo>();
 
+        protected virtual PlayerInfo FindLocalPlayer() => Players.Find(p => p.Name == ProgramConstants.PLAYERNAME);
+
         protected bool PlayerUpdatingInProgress { get; set; }
 
         protected Texture2D[] RankTextures;

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs
@@ -424,7 +424,7 @@ protected override void UpdateDiscordPresence(bool resetTimer = false)
             if (discordHandler == null)
                 return;
 
-            PlayerInfo player = Players.Find(p => p.Name == ProgramConstants.PLAYERNAME);
+            PlayerInfo player = FindLocalPlayer();
             if (player == null || Map == null || GameMode == null)
                 return;
             string side = "";
@@ -847,7 +847,8 @@ private void HandlePlayerOptionsBroadcast(string data)
             if (parts.Length != playerCount * 8)
                 return;
 
-            int oldSide = Players.Find(p => p.Name == ProgramConstants.PLAYERNAME).SideId;
+            PlayerInfo localPlayer = FindLocalPlayer();
+            int oldSideId = localPlayer == null ? -1 : localPlayer.SideId;
 
             Players.Clear();
             AIPlayers.Clear();
@@ -911,7 +912,8 @@ private void HandlePlayerOptionsBroadcast(string data)
             }
 
             CopyPlayerDataToUI();
-            if (oldSide != Players.Find(p => p.Name == ProgramConstants.PLAYERNAME).SideId)
+            localPlayer = FindLocalPlayer();
+            if (localPlayer != null && oldSideId != localPlayer.SideId)
                 UpdateDiscordPresence();
         }
 

diff --git a/DXMainClient/Properties/AssemblyInfo.cs b/DXMainClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.2.3")]
-[assembly: AssemblyFileVersion("2.6.2.3")]
+[assembly: AssemblyVersion("2.6.2.4")]
+[assembly: AssemblyFileVersion("2.6.2.4")]