Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop

This commit is contained in:
Jammyjamjamman
2018-03-04 19:37:39 +00:00

View File

@@ -4407,8 +4407,13 @@ namespace Glest
listBoxControls[i].setEnabled (true);
listBoxFactions[i].setEditable (true);
listBoxTeams[i].setEditable (true);
if (listBoxFactions[i].getSelectedItem () ==
formatString (GameConstants::OBSERVER_SLOTNAME))
{
listBoxFactions[i].setSelectedItemIndex (0);
}
}
else
{
listBoxControls[i].setEditable (false);