Fix OnGameOptionChanged crash on empty map

CnCNet · Sep 19, 2024 · f247455 · f247455
1 parent 3cd0eb3
commit f247455
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs
@@ -968,6 +968,11 @@ protected override void OnGameOptionChanged()
         {
             base.OnGameOptionChanged();
 
+            // Don't broadcast game options if the current map or game mode is null.
+            // Don't worry about the game mode change. Upon a map is selected, OnGameOptionChanged() will be called again.
+            if (Map == null || GameMode == null)
+                return;
+
             if (!IsHost)
                 return;
 

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs
@@ -550,6 +550,11 @@ protected override void OnGameOptionChanged()
         {
             base.OnGameOptionChanged();
 
+            // Don't broadcast game options if the current map or game mode is null.
+            // Don't worry about the game mode change. Upon a map is selected, OnGameOptionChanged() will be called again.
+            if (Map == null || GameMode == null)
+                return;
+
             if (!IsHost)
                 return;