Changed implementation.

Author: Caball009

Core/GameEngine/Include/GameNetwork/LANGameInfo.h

@@ -171,6 +171,7 @@ class LANGameInfo : public GameInfo
 
 void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList );	///< Displays the list of games in a listbox, preserving selections
 void LANEnableStartButton(Bool enabled);
+void LANDisableButtons();
 
 void LANDisplaySlotList();		///< Displays the slot list according to TheLANGameInfo
 void LANDisplayGameOptions();	///< Displays the game options according to TheLANGameInfo

Core/GameEngine/Source/GameNetwork/LANAPI.cpp

@@ -589,6 +589,13 @@ void LANAPI::update()
 		// m_gameStartTime is when the next message goes out
 		// m_gameStartSeconds is how many seconds remain in the message
 
+		if (m_gameStartSeconds == 1)
+		{
+			// TheSuperHackers @bugfix Disable LAN controls early to avoid a rare crash
+			// that may happen when using the buttons at the very last moment (after they're deinitialized).
+			LANDisableButtons();
+		}
+
 		RequestGameStartTimer( m_gameStartSeconds );
 	}
 	else if (m_gameStartTime && m_gameStartTime <= now)

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp

@@ -389,6 +389,25 @@ void LANEnableStartButton(Bool enabled)
 	buttonSelectMap->winEnable(enabled);
 }
 
+void LANDisableButtons()
+{
+	buttonStart->winEnable(false);
+	buttonBack->winEnable(false);
+	buttonSelectMap->winEnable(false);
+	checkboxLimitSuperweapons->winEnable(false);
+	comboBoxStartingCash->winEnable(false);
+
+	for (Int i = 0; i < MAX_SLOTS; ++i)
+	{
+		comboBoxPlayer[i]->winEnable(false);
+		comboBoxColor[i]->winEnable(false);
+		comboBoxPlayerTemplate[i]->winEnable(false);
+		comboBoxTeam[i]->winEnable(false);
+		buttonAccept[i]->winEnable(false);
+		buttonMapStartPosition[i]->winEnable(false);
+	}
+}
+
 static void handleColorSelection(int index)
 {
 	GameWindow *combo = comboBoxColor[index];