Changeset 21836 for ps

Timestamp:

06/05/18 14:24:30 (7 years ago)

Author:

elexis

Message:

Fix an OOS on rejoin after doubleclicking on the StartGame button, fixes #5199, refs #5162.

Prevents changes to the gamesettings after the game was started, so as to use the correct map seed when generating the random map terrain for rejoiners.
D1558 will prevent the UI bug #5206 and FSM error from doubleclicking on StartGame.

Differential Revision: ​https://code.wildfiregames.com/D1562
Tested and accepted by: temple

File:

• ps/trunk/source/network/NetServer.cpp (modified) (1 diff)

ps/trunk/source/network/NetServer.cpp

@@ -1218 +1218 @@
     CNetServerWorker& server = session->GetServer();
 
+    // Changing the settings after gamestart is not implemented and would cause an Out-of-sync error.
+    // This happened when doubleclicking on the startgame button.
+    if (server.m_State != SERVER_STATE_PREGAME)
+        return true;
+
     if (session->GetGUID() == server.m_HostGUID)
     {