added a check for missing data in menu
This commit is contained in:
parent
77fba5a65e
commit
aa1efb5d3a
|
@ -2223,8 +2223,9 @@ void MenuStateCustomGame::switchSetupForSlots(SwitchSetupRequest **switchSetupRe
|
||||||
ConnectionSlot *slot = serverInterface->getSlot(newFactionIdx);
|
ConnectionSlot *slot = serverInterface->getSlot(newFactionIdx);
|
||||||
|
|
||||||
if(switchSetupRequests[i]->getSelectedFactionName() != "" &&
|
if(switchSetupRequests[i]->getSelectedFactionName() != "" &&
|
||||||
(slot != NULL && switchSetupRequests[i]->getSelectedFactionName() !=
|
(slot != NULL &&
|
||||||
Lang::getInstance().getString("DataMissing",slot->getNetworkPlayerLanguage(),true))) {
|
switchSetupRequests[i]->getSelectedFactionName() != Lang::getInstance().getString("DataMissing",slot->getNetworkPlayerLanguage(),true) &&
|
||||||
|
switchSetupRequests[i]->getSelectedFactionName() != "???DataMissing???")) {
|
||||||
listBoxFactions[newFactionIdx].setSelectedItem(switchSetupRequests[i]->getSelectedFactionName());
|
listBoxFactions[newFactionIdx].setSelectedItem(switchSetupRequests[i]->getSelectedFactionName());
|
||||||
}
|
}
|
||||||
if(switchSetupRequests[i]->getToTeam() != -1) {
|
if(switchSetupRequests[i]->getToTeam() != -1) {
|
||||||
|
@ -2260,8 +2261,9 @@ void MenuStateCustomGame::switchSetupForSlots(SwitchSetupRequest **switchSetupRe
|
||||||
ConnectionSlot *slot = serverInterface->getSlot(factionIdx);
|
ConnectionSlot *slot = serverInterface->getSlot(factionIdx);
|
||||||
|
|
||||||
if(switchSetupRequests[i]->getSelectedFactionName() != "" &&
|
if(switchSetupRequests[i]->getSelectedFactionName() != "" &&
|
||||||
(slot != NULL && switchSetupRequests[i]->getSelectedFactionName() !=
|
(slot != NULL &&
|
||||||
Lang::getInstance().getString("DataMissing",slot->getNetworkPlayerLanguage(),true))) {
|
switchSetupRequests[i]->getSelectedFactionName() != Lang::getInstance().getString("DataMissing",slot->getNetworkPlayerLanguage(),true) &&
|
||||||
|
switchSetupRequests[i]->getSelectedFactionName() != "???DataMissing???")) {
|
||||||
listBoxFactions[i].setSelectedItem(switchSetupRequests[i]->getSelectedFactionName());
|
listBoxFactions[i].setSelectedItem(switchSetupRequests[i]->getSelectedFactionName());
|
||||||
}
|
}
|
||||||
if(switchSetupRequests[i]->getToTeam() != -1) {
|
if(switchSetupRequests[i]->getToTeam() != -1) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user