From cdba95f6ace04dcfe23be0d702d606becedcf024 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 8 Oct 2010 15:20:24 +0000 Subject: [PATCH] - fixed silly bug when editing username in custom game menu interferes with chat. --- source/glest_game/menu/menu_state_custom_game.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index dbd6e12d9..40b7975bc 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -1242,7 +1242,7 @@ void MenuStateCustomGame::update() { if(switchSetupRequests[i]->getNetworkPlayerName() != "") { SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d] i = %d, labelPlayerNames[newFactionIdx].getText() [%s] switchSetupRequests[i]->getNetworkPlayerName() [%s]\n",__FILE__,__FUNCTION__,__LINE__,i,labelPlayerNames[newFactionIdx].getText().c_str(),switchSetupRequests[i]->getNetworkPlayerName().c_str()); labelPlayerNames[newFactionIdx].setText(switchSetupRequests[i]->getNetworkPlayerName()); - SetActivePlayerNameEditor(); + //SetActivePlayerNameEditor(); } } catch(const runtime_error &e) { @@ -1268,7 +1268,7 @@ void MenuStateCustomGame::update() { else { labelPlayerNames[i].setText(""); } - SetActivePlayerNameEditor(); + //SetActivePlayerNameEditor(); //switchSetupRequests[i]->clearSwitchFlag(ssrft_NetworkPlayerName); } } @@ -2025,7 +2025,7 @@ GameSettings MenuStateCustomGame::loadGameSettingsFromFile(std::string fileName) labelPlayerNames[i].setText(gameSettings.getNetworkPlayerName(i)); } - SetActivePlayerNameEditor(); + //SetActivePlayerNameEditor(); updateControlers(); updateNetworkSlots();