From a7e7b00cbaaf5409a13bf5bacbd345a25c4a99d3 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Thu, 13 May 2010 07:24:59 +0000
Subject: [PATCH] added another thread shutdown

---
 source/glest_game/menu/menu_state_masterserver.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index 6607a034..25932665 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -151,6 +151,10 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
 
 MenuStateMasterserver::~MenuStateMasterserver() {
 	clearServerLines();
+
+	BaseThread::shutdownAndWait(updateFromMasterserverThread);
+	delete updateFromMasterserverThread;
+	updateFromMasterserverThread = NULL;
 }
 
 void MenuStateMasterserver::clearServerLines(){
@@ -183,6 +187,8 @@ void MenuStateMasterserver::mouseClick(int x, int y, MouseButton mouseButton){
     }
     else if(buttonReturn.mouseClick(x, y)){
 		soundRenderer.playFx(coreData.getClickSoundB());
+
+		BaseThread::shutdownAndWait(updateFromMasterserverThread);
 		mainMenu->setState(new MenuStateRoot(program, mainMenu));
     }
     else{