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

added another thread shutdown

Browse Source
This commit is contained in:
Mark Vejvoda
2010-05-13 07:24:59 +00:00
parent c5485be4da
commit a7e7b00cba
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/menu/menu_state_masterserver.cpp
View File

@@ -151,6 +151,10 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
MenuStateMasterserver::~MenuStateMasterserver() { MenuStateMasterserver::~MenuStateMasterserver() {
clearServerLines(); clearServerLines();
BaseThread::shutdownAndWait(updateFromMasterserverThread);
delete updateFromMasterserverThread;
updateFromMasterserverThread = NULL;
} }
void MenuStateMasterserver::clearServerLines(){ void MenuStateMasterserver::clearServerLines(){
@@ -183,6 +187,8 @@ void MenuStateMasterserver::mouseClick(int x, int y, MouseButton mouseButton){
} }
else if(buttonReturn.mouseClick(x, y)){ else if(buttonReturn.mouseClick(x, y)){
soundRenderer.playFx(coreData.getClickSoundB()); soundRenderer.playFx(coreData.getClickSoundB());
BaseThread::shutdownAndWait(updateFromMasterserverThread);
mainMenu->setState(new MenuStateRoot(program, mainMenu)); mainMenu->setState(new MenuStateRoot(program, mainMenu));
} }
else{ else{