Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix for join game segfault posted by atze

Browse Source
This commit is contained in:
Mark Vejvoda 2013-05-30 06:28:09 +00:00
parent 79c3c1eed5
commit a0506e3486
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/glest_game/game/game.cpp
View File

@ -5655,8 +5655,11 @@ void Game::setPaused(bool value,bool forceAllowPauseStateChange,bool clearCaches
if(forceAllowPauseStateChange == true || speedChangesAllowed == true) {
//printf("setPaused paused = %d, value = %d\n",paused,value);
NetworkManager &networkManager= NetworkManager::getInstance();
// Cannot change pause state while client is joining in progress game
if(pausedForJoinGame == true && joinNetworkGame == false) {
if(pausedForJoinGame == true && joinNetworkGame == false &&
networkManager.getNetworkRole() == nrServer) {
ServerInterface *server = NetworkManager::getInstance().getServerInterface();
Lang &lang= Lang::getInstance();
@ -5711,7 +5714,7 @@ void Game::setPaused(bool value,bool forceAllowPauseStateChange,bool clearCaches
setupPopupMenus(false);
//!!!
NetworkManager &networkManager= NetworkManager::getInstance();
//NetworkManager &networkManager= NetworkManager::getInstance();
if(networkManager.getNetworkRole() == nrClient) {
//ClientInterface *clientInterface = dynamic_cast<ClientInterface *>(networkManager.getClientInterface());
//if(clientInterface != NULL && clientInterface->getResumeInGameJoin() == true) {