From 70383f2a30cd6ac6e8bfce0d0b251cdf9b20146d Mon Sep 17 00:00:00 2001
From: Titus Tscharntke <titi_ger@users.sourceforge.net>
Date: Mon, 17 May 2010 20:05:31 +0000
Subject: [PATCH] better handling of attention sound / errormessages ...

---
 source/glest_game/menu/menu_state_custom_game.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index bac05111b..4dd1eae7c 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -64,7 +64,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
 	lastMasterserverPublishing 	= 0;
 	soundConnectionCount=0;
 
-	mainMessageBox.init(lang.get("Ok"),lang.get("Return"));
+	mainMessageBox.init(lang.get("Ok"));
 	mainMessageBox.setEnabled(false);
 	mainMessageBoxState=0;
 
@@ -266,10 +266,6 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
 			{
 				mainMessageBox.setEnabled(false);
 			}
-			else if(button==2)
-			{
-				returnToParentMenu();
-			}
 		}
 	}
 	else if(buttonReturn.mouseClick(x,y)){
@@ -534,7 +530,7 @@ void MenuStateCustomGame::update()
 			{
 				masterServererErrorToShow=lang.get("wrong router setup");
 			}
-			showMasterserverError=true;
+			showMasterserverError=false;
 			listBoxPublishServer.setSelectedItemIndex(1);
 			mainMessageBoxState=1;
 			showMessageBox( masterServererErrorToShow, lang.get("ErrorFromMasterserver"), false);
@@ -609,7 +605,8 @@ void MenuStateCustomGame::update()
 					//printf("FYI we have at least 1 client connected, slot = %d'\n",i);
 
 					haveAtLeastOneNetworkClientConnected = true;
-					currentConnectionCount++;
+					if(connectionSlot->getName()!="")
+						currentConnectionCount++;
 					//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] B - ctNetwork\n",__FILE__,__FUNCTION__);
 
 					string label = connectionSlot->getName();