Changeset 21837 for ps

Timestamp:

06/05/18 16:52:41 (7 years ago)

Author:

elexis

Message:

Fix network FSM errors when a client closes the game during the loading screen or rejoin synchronization stage, fixes #4594, refs 3199.

Fix comments claiming to ensure reliability when in reality there is only a small likelihood of the message being received.

Broken by rP14732 / refs #2420 which was a preparation for rP14772 / refs #2373, which hence didn't actually work and was circumvented by rP15106 without clarification.
Might have caused #3643.
Differential Revision: ​https://code.wildfiregames.com/D1557
Reviewed By: Imarok

Location:

ps/trunk/source/network

Files:

• NetClient.cpp (modified) (1 diff)
• NetClientTurnManager.cpp (modified) (1 diff)

ps/trunk/source/network/NetClient.cpp

@@ -182 +182 @@
 void CNetClient::DestroyConnection()
 {
-    // Send network messages from the current frame before connection is destroyed.
+    // Attempt to send network messages from the current frame before connection is destroyed.
     if (m_ClientTurnManager)
     {
-        m_ClientTurnManager->OnDestroyConnection(); // End sending of commands for scheduled turn.
-        Flush(); // Make sure the messages are sent.
+        m_ClientTurnManager->OnDestroyConnection();
+        Flush();
     }
     SAFE_DELETE(m_Session);

ps/trunk/source/network/NetClientTurnManager.cpp

@@ -96 +96 @@
 void CNetClientTurnManager::OnDestroyConnection()
 {
-    NotifyFinishedOwnCommands(m_CurrentTurn + COMMAND_DELAY);
+    // Attempt to flush messages before leaving.
+    // Notice the sending is not reliable and rarely makes it to the Server.
+    if (m_NetClient.GetCurrState() == NCS_INGAME)
+        NotifyFinishedOwnCommands(m_CurrentTurn + COMMAND_DELAY);
 }