Ticket #2779: 2779.diff

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -382 +382 @@
         var civ = Engine.GetGUIObjectByName("playerCiv["+i+"]");
         civ.onSelectionChange = function()
         {   // Update civ
-            if ((this.selected != -1)&&(g_GameAttributes.mapType !== "scenario"))
+            if ((this.selected != -1)&&(g_GameAttributes.mapType !== "scenario")&&(this.list_data[this.selected] !== undefined))
                 g_GameAttributes.settings.PlayerData[playerSlot].Civ = this.list_data[this.selected];
 
             if (!g_IsInGuiUpdate)
@@ -1029 +1029 @@
         var mapSelectionBox = Engine.GetGUIObjectByName("mapSelection");
         mapSelectionBox.selected = mapSelectionBox.list_data.indexOf(mapName);
         Engine.GetGUIObjectByName("mapSelectionText").caption = translate(getMapDisplayName(mapName));
-        var populationCapBox = Engine.GetGUIObjectByName("populationCap");
-        populationCapBox.selected = populationCapBox.list_data.indexOf(mapSettings.PopulationCap);
-        var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
-        startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
+        
+        if (mapSettings.PopulationCap !== undefined)
+        {
+            var populationCapBox = Engine.GetGUIObjectByName("populationCap");
+            populationCapBox.selected = populationCapBox.list_data.indexOf(mapSettings.PopulationCap);
+        }
+        
+        if (mapSettings.StartingResources !== undefined)
+        {
+            var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
+            startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
+        }
+
         initMapNameList();
     }