Ticket #2420: sendNetworkMessagesAtGameEnd_v2.patch

source/network/NetClient.cpp

@@ -144 +144 @@
 
 void CNetClient::DestroyConnection()
 {
+    // send network messages of current frame before connection get's destroyed
+    if (m_ClientTurnManager)
+    {
+        m_ClientTurnManager->OnDestroyConnection(); // end sending commands for scheduled turn
+        Flush(); // make sure the messages are send
+    }
     SAFE_DELETE(m_Session);
 }
 

source/network/NetTurnManager.cpp

@@ -419 +419 @@
     m_NetClient.SendMessage(&msg);
 }
 
+void CNetClientTurnManager::OnDestroyConnection()
+{
+    NotifyFinishedOwnCommands(m_CurrentTurn + COMMAND_DELAY);
+}
+
 void CNetClientTurnManager::OnSimulationMessage(CSimulationMessage* msg)
 {
     // Command received from the server - store it for later execution

source/network/NetTurnManager.h

@@ -200 +200 @@
     virtual void OnSimulationMessage(CSimulationMessage* msg);
 
     virtual void PostCommand(CScriptValRooted data);
+    
+    /**
+     * notifiy the server that all commands for the scheduled turn are send before the connection is destroyed
+     */
+    void OnDestroyConnection();
 
 protected:
     virtual void NotifyFinishedOwnCommands(u32 turn);

source/ps/GameSetup/GameSetup.cpp

@@ -654 +654 @@
 
 void EndGame()
 {
+    SAFE_DELETE(g_NetClient);
     SAFE_DELETE(g_NetServer);
-    SAFE_DELETE(g_NetClient);
     SAFE_DELETE(g_Game);
 
     ISoundManager::CloseGame();