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

attempt to fix titi's segfault when reloading and exiting custom menu

Browse Source
This commit is contained in:
Mark Vejvoda 2013-06-06 23:57:21 +00:00
parent ed00d9ad8b
commit 462524bcae
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -939,11 +939,13 @@ void MenuStateCustomGame::cleanup() {
if(forceWaitForShutdown == true) {
time_t elapsed = time(NULL);
publishToMasterserverThread->signalQuit();
for(;publishToMasterserverThread->canShutdown(false) == false &&
for(;(publishToMasterserverThread->canShutdown(false) == false ||
publishToMasterserverThread->getRunningStatus() == true) &&
difftime((long int)time(NULL),elapsed) <= 15;) {
//sleep(150);
}
if(publishToMasterserverThread->canShutdown(true)) {
if(publishToMasterserverThread->canShutdown(true) == true &&
publishToMasterserverThread->getRunningStatus() == false) {
delete publishToMasterserverThread;
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
}
@ -955,6 +957,9 @@ void MenuStateCustomGame::cleanup() {
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s",szBuf);
publishToMasterserverThread->setOverrideShutdownTask(shutdownTaskStatic);
publishToMasterserverThread->setDeleteSelfOnExecutionDone(true);
publishToMasterserverThread->setDeleteAfterExecute(true);
//publishToMasterserverThread->cleanup();
}
publishToMasterserverThread = NULL;
@ -963,7 +968,7 @@ void MenuStateCustomGame::cleanup() {
publishToMasterserverThread->signalQuit();
sleep(0);
if(publishToMasterserverThread->canShutdown(true) == true &&
publishToMasterserverThread->shutdownAndWait() == true) {
publishToMasterserverThread->getRunningStatus() == false) {
delete publishToMasterserverThread;
}
else {
@ -974,6 +979,8 @@ void MenuStateCustomGame::cleanup() {
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s",szBuf);
publishToMasterserverThread->setOverrideShutdownTask(shutdownTaskStatic);
publishToMasterserverThread->setDeleteSelfOnExecutionDone(true);
publishToMasterserverThread->setDeleteAfterExecute(true);
//publishToMasterserverThread->cleanup();
}
}