From 3d132d11a2aa1d75882bedcce22cfb830942e7b4 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Fri, 15 Oct 2010 01:52:36 +0000
Subject: [PATCH] - added an extra guard to the masterserver thread pointer in
 case something happens in the constructor, now I make sure the thread pointer
 is set to NULL at the top of the constructor for safety.

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

diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index b28095a2..23b56b83 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -179,6 +179,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
 	MenuState(program, mainMenu, "masterserver") 
 {
 	containerName = "MasterServer";
+	updateFromMasterserverThread = NULL;
 	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 
 	Lang &lang= Lang::getInstance();