mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 11:19:48 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for segfault in menu when exiting too fast

Browse Source
This commit is contained in:
Mark Vejvoda
2012-03-05 22:53:03 +00:00
parent 7399d10247
commit 623623d33f
5 changed files with 61 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/shared_lib/sources/platform/common/simple_threads.cpp
View File

@@ -296,6 +296,8 @@ SimpleTaskThread::SimpleTaskThread( SimpleTaskCallbackInterface *simpleTaskInter
this->executionCount = executionCount;
this->millisecsBetweenExecutions = millisecsBetweenExecutions;
this->needTaskSignal = needTaskSignal;
this->overrideShutdownTask = NULL;
setTaskSignalled(false);
static string mutexOwnerId = string(__FILE__) + string("_") + intToStr(__LINE__);
@@ -308,10 +310,7 @@ SimpleTaskThread::SimpleTaskThread( SimpleTaskCallbackInterface *simpleTaskInter
SimpleTaskThread::~SimpleTaskThread() {
try {
if(this->simpleTaskInterface != NULL) {
this->simpleTaskInterface->shutdownTask(this);
this->simpleTaskInterface = NULL;
}
cleanup();
}
catch(const exception &ex) {
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what());
@@ -322,6 +321,21 @@ SimpleTaskThread::~SimpleTaskThread() {
}
}
void SimpleTaskThread::cleanup() {
if(this->overrideShutdownTask != NULL) {
this->overrideShutdownTask(this);
this->overrideShutdownTask = NULL;
}
else if(this->simpleTaskInterface != NULL) {
this->simpleTaskInterface->shutdownTask(this);
this->simpleTaskInterface = NULL;
}
}
void SimpleTaskThread::setOverrideShutdownTask(taskFunctionCallback *ptr) {
this->overrideShutdownTask = ptr;
}
bool SimpleTaskThread::isThreadExecutionLagging() {
bool result = false;
static string mutexOwnerId = string(__FILE__) + string("_") + intToStr(__LINE__);

3
source/shared_lib/sources/util/util.cpp
View File

@@ -155,6 +155,9 @@ std::string SystemFlags::getHTTP(std::string URL,CURL *handle,int timeOut,CURLco
/* get contents from the URL */
CURLcode result = curl_easy_perform(handle);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("CURL result = %d\n",result);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("CURL errbuf [%s]\n",errbuf);
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d] return code [%d] [%s]\n",__FILE__,__FUNCTION__,__LINE__,result,errbuf);
std::string serverResponse = (chunk.memory != NULL ? chunk.memory : "");