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

Fixed a hideous debug output bug in custom menu causing a crash

Browse Source
This commit is contained in:
Mark Vejvoda
2010-06-11 01:33:43 +00:00
parent e1fffda0cd
commit c6d83dc6bb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -973,13 +973,16 @@ void MenuStateCustomGame::update()
SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound()); SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());
} }
soundConnectionCount = currentConnectionCount; soundConnectionCount = currentConnectionCount;
safeMutex.ReleaseLock(false); safeMutex.ReleaseLock(true);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
catch(const std::exception &ex) { catch(const std::exception &ex) {
char szBuf[1024]=""; char szBuf[1024]="";
sprintf(szBuf,"In [%s::%s %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what()); sprintf(szBuf,"In [%s::%s %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what());
throw runtime_error(szBuf); throw runtime_error(szBuf);
} }
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
void MenuStateCustomGame::publishToMasterserver() void MenuStateCustomGame::publishToMasterserver()
@@ -1031,6 +1034,7 @@ void MenuStateCustomGame::publishToMasterserver()
serverinfo += "connectedClients=" + intToStr(slotCountConnectedPlayers); serverinfo += "connectedClients=" + intToStr(slotCountConnectedPlayers);
publishToServerInfo = serverinfo; publishToServerInfo = serverinfo;
safeMutex.ReleaseLock();
} }
void MenuStateCustomGame::simpleTask() { void MenuStateCustomGame::simpleTask() {
@@ -1056,12 +1060,12 @@ void MenuStateCustomGame::simpleTask() {
safeMutex.ReleaseLock(false); safeMutex.ReleaseLock(false);
//printf("the request is:\n%s\n",request.c_str()); //printf("the request is:\n%s\n",request.c_str());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]the request is:\n%s\n",request.c_str(),__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d] the request is:\n%s\n",__FILE__,__FUNCTION__,__LINE__,request.c_str());
std::string serverInfo = SystemFlags::getHTTP(request); std::string serverInfo = SystemFlags::getHTTP(request);
//printf("the result is:\n'%s'\n",serverInfo.c_str()); //printf("the result is:\n'%s'\n",serverInfo.c_str());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]the result is:\n'%s'\n",serverInfo.c_str(),__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d] the result is:\n'%s'\n",__FILE__,__FUNCTION__,__LINE__,serverInfo.c_str());
// uncomment to enable router setup check of this server // uncomment to enable router setup check of this server
//if(serverInfo!="OK") //if(serverInfo!="OK")
if(EndsWith(serverInfo, "OK") == false) if(EndsWith(serverInfo, "OK") == false)
@@ -1103,7 +1107,7 @@ void MenuStateCustomGame::simpleTask() {
} }
void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) { void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
MutexSafeWrapper safeMutex(&masterServerThreadAccessor); MutexSafeWrapper safeMutex(&masterServerThreadAccessor);