diff --git a/source/glest_game/network/connection_slot.cpp b/source/glest_game/network/connection_slot.cpp index 742cca48..989d5820 100644 --- a/source/glest_game/network/connection_slot.cpp +++ b/source/glest_game/network/connection_slot.cpp @@ -322,12 +322,14 @@ ConnectionSlot::ConnectionSlot(ServerInterface* serverInterface, int playerIndex this->gotLagCountWarning = false; this->lastReceiveCommandListTime = 0; this->receivedNetworkGameStatus = false; - this->canAcceptConnections = true; - this->startInGameConnectionLaunch = false; - this->sentSavedGameInfo = false; - this->unPauseForInGameConnection = false; + this->skipLagCheck = false; this->joinGameInProgress = false; + this->canAcceptConnections = true; + this->startInGameConnectionLaunch = false; + this->pauseForInGameConnection = false; + this->unPauseForInGameConnection = false; + this->sentSavedGameInfo = false; this->setSocket(NULL); this->slotThreadWorker = NULL; @@ -1460,6 +1462,7 @@ void ConnectionSlot::close() { this->skipLagCheck = false; this->joinGameInProgress = false; this->sentSavedGameInfo = false; + this->pauseForInGameConnection = false; this->unPauseForInGameConnection = false; this->ready= false; this->connectedTime = 0; diff --git a/source/glest_game/network/connection_slot.h b/source/glest_game/network/connection_slot.h index 89fad4a2..d5861d37 100644 --- a/source/glest_game/network/connection_slot.h +++ b/source/glest_game/network/connection_slot.h @@ -128,8 +128,6 @@ private: bool receivedNetworkGameStatus; time_t connectedTime; bool gotIntro; - bool skipLagCheck; - bool joinGameInProgress; Mutex *mutexCloseConnection; @@ -146,6 +144,8 @@ private: int playerStatus; string playerLanguage; + bool skipLagCheck; + bool joinGameInProgress; bool canAcceptConnections; bool startInGameConnectionLaunch; bool pauseForInGameConnection;