Changeset 10123 for ps

Timestamp:

08/28/11 07:57:09 (13 years ago)

Author:

ben

Message:

Fixes bug on object panel (assert fail when map was loaded before the panel was displayed).

File:

• ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp (modified) (1 diff)

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp

@@ -281 +281 @@
         }
 
-        if (m_ObjectSettings.GetPlayerID() > numPlayers)
+        // The control may not have entries yet
+        if (m_ObjectSettings.GetPlayerID() >= GetCount())
         {
             // Invalid player
-            SetSelection((long)numPlayers);
+            SetSelection((long)GetCount()-1);
         }
         else