Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes Atlas assertion failure on wxOSX/Cocoa by properly checking combo box selection index.

Browse Source 
This was SVN commit r11135.
This commit is contained in:
historic_bruno 2012-02-24 04:40:29 +00:00
parent 6db9c41e7c
commit d3038bbb5c
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
View File

@ -308,14 +308,30 @@ private:
Observable<AtObj>& m_MapSettings;
wxArrayString m_Players;
void SetSelection(size_t playerID)
{
// This control may not be loaded yet (before first display)
// or may have less items than we expect, which could cause
// an assertion failure, so handle that here
if (playerID < GetCount())
{
wxComboBox::SetSelection((int)playerID);
}
else
{
// Invalid selection
wxComboBox::SetSelection(wxNOT_FOUND);
}
}
void OnObjectSettingsChange(const ObjectSettings& settings)
{
SetSelection((long)settings.GetPlayerID());
SetSelection(settings.GetPlayerID());
}
void OnMapSettingsChange(const AtObj& settings)
{
// Adjust displayed number of players
// Reload displayed player names
Clear();
size_t numPlayers = settings["PlayerData"]["item"].count();
for (size_t i = 0; i <= numPlayers && i < m_Players.Count(); ++i)
@ -323,16 +339,7 @@ private:
Append(m_Players[i]);
}
// The control may not have entries yet
if (m_ObjectSettings.GetPlayerID() >= GetCount())
{
// Invalid player
SetSelection((long)GetCount()-1);
}
else
{
SetSelection((long)m_ObjectSettings.GetPlayerID());
}
SetSelection(m_ObjectSettings.GetPlayerID());
}
void OnSelect(wxCommandEvent& evt)