From 14bd71c250dd5971f60f1d40e8002a33d78e71b4 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 22 Mar 2011 06:43:33 +0000
Subject: [PATCH] - game ready status bugfix

---
 .../menu/menu_state_custom_game.cpp           | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 1426d60a..a134f0e5 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -1548,25 +1548,34 @@ void MenuStateCustomGame::update() {
 		GameSettings gameSettings;
 		loadGameSettings(&gameSettings);
 
+		int factionCount = 0;
 		for(int i= 0; i< mapInfo.players; ++i) {
 			//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
 
 			if(hasNetworkGameSettings() == true) {
-				if(listBoxControls[i].getSelectedItemIndex() == ctHuman) {
-					switch(gameSettings.getNetworkPlayerStatuses(i)) {
-						case npst_BeRightBack:
-							labelPlayerStatus[i].setText(lang.get("PlayerStatusBeRightBack"));
-							break;
-						case npst_Ready:
-							labelPlayerStatus[i].setText(lang.get("PlayerStatusReady"));
-							break;
-						case npst_PickSettings:
-							labelPlayerStatus[i].setText(lang.get("PlayerStatusSetup"));
-							break;
-						default:
-							labelPlayerStatus[i].setText("");
-							break;
+				if(listBoxControls[i].getSelectedItemIndex() != ctClosed) {
+					int slotIndex = factionCount;
+					if(listBoxControls[i].getSelectedItemIndex() == ctHuman) {
+						switch(gameSettings.getNetworkPlayerStatuses(slotIndex)) {
+							case npst_BeRightBack:
+								labelPlayerStatus[i].setText(lang.get("PlayerStatusBeRightBack"));
+								break;
+							case npst_Ready:
+								labelPlayerStatus[i].setText(lang.get("PlayerStatusReady"));
+								break;
+							case npst_PickSettings:
+								labelPlayerStatus[i].setText(lang.get("PlayerStatusSetup"));
+								break;
+							default:
+								labelPlayerStatus[i].setText("");
+								break;
+						}
 					}
+					else {
+						labelPlayerStatus[i].setText("");
+					}
+
+					factionCount++;
 				}
 				else {
 					labelPlayerStatus[i].setText("");