From 0570f0a9749239dac85c0d8028e6572210c32769 Mon Sep 17 00:00:00 2001
From: HadeanLake <69697985+HadeanLake@users.noreply.github.com>
Date: Tue, 1 Sep 2020 18:44:00 +0300
Subject: [PATCH] Few UI fixes (#3070)

* Fixed close button in LoadMapScreen
setDefaultCloseAction(MainMenuScreen())
* Fixed mapFileSelectBox in MapOptionsTable
first map will be properly selected upon creation of mapFileSelectBox
---
 core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt       | 4 ++--
 core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt b/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
index c20ed474d7..3ece12daf9 100644
--- a/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
+++ b/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.badlogic.gdx.utils.Align
+import com.unciv.MainMenuScreen
 import com.unciv.UncivGame
 import com.unciv.logic.MapSaver
 import com.unciv.logic.map.TileMap
@@ -79,8 +80,7 @@ class LoadMapScreen(previousMap: TileMap?) : PickerScreen(){
         rightSideTable.add(deleteButton).row()
 
         topTable.add(rightSideTable)
-        if (previousMap != null)
-            closeButton.onClick { UncivGame.Current.setScreen(MapEditorScreen(previousMap)) }
+        setDefaultCloseAction(MainMenuScreen())
 
         update()
     }
diff --git a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
index e109e08581..7f870c5529 100644
--- a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
@@ -145,7 +145,9 @@ class MapOptionsTable(val newGameScreen: NewGameScreen): Table() {
         }
         mapFileSelectBox.items = mapFiles
         val selectedItem = mapFiles.firstOrNull { it.fileHandle.name()==mapParameters.name }
-        if(selectedItem!=null) mapFileSelectBox.selected = selectedItem
+        if (selectedItem != null) mapFileSelectBox.selected = selectedItem
+        else mapFileSelectBox.selected = mapFiles.first()
+        newGameScreen.gameSetupInfo.mapFile = mapFileSelectBox.selected.fileHandle
 
         mapFileSelectBox.onChange {
             val mapFile =  mapFileSelectBox.selected.fileHandle