Skip to content

Commit 4de60c2

Browse files
authored
bugfix(money): Fix undefined behavior for starting cash combo box (#2582)
1 parent b7fcf9f commit 4de60c2

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

  • GeneralsMD/Code/GameEngine/Source/GameNetwork

GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,7 @@ void PopulateStartingCashComboBox(GameWindow *comboBox, GameInfo *myGame)
334334
const MultiplayerStartingMoneyList & startingCashMap = TheMultiplayerSettings->getStartingMoneyList();
335335
Int currentSelectionIndex = -1;
336336

337-
MultiplayerStartingMoneyList::const_iterator it = startingCashMap.begin();
338-
for ( ; it != startingCashMap.end(); it++ )
337+
for (MultiplayerStartingMoneyList::const_iterator it = startingCashMap.begin(); it != startingCashMap.end(); it++ )
339338
{
340339
Int newIndex = GadgetComboBoxAddEntry(comboBox, formatMoneyForStartingCashComboBox( *it ),
341340
comboBox->winGetEnabled() ? comboBox->winGetEnabledTextColor() : comboBox->winGetDisabledTextColor());
@@ -352,7 +351,7 @@ void PopulateStartingCashComboBox(GameWindow *comboBox, GameInfo *myGame)
352351
DEBUG_CRASH( ("Current selection for starting cash not found in list") );
353352
currentSelectionIndex = GadgetComboBoxAddEntry(comboBox, formatMoneyForStartingCashComboBox( myGame->getStartingCash() ),
354353
comboBox->winGetEnabled() ? comboBox->winGetEnabledTextColor() : comboBox->winGetDisabledTextColor());
355-
GadgetComboBoxSetItemData(comboBox, currentSelectionIndex, (void *)it->countMoney() );
354+
GadgetComboBoxSetItemData(comboBox, currentSelectionIndex, (void *)myGame->getStartingCash().countMoney() );
356355
}
357356

358357
GadgetComboBoxSetSelectedPos(comboBox, currentSelectionIndex);

0 commit comments

Comments
 (0)