From 9f9e8c33c5196cd46d2e19e8be5da8988b81d0c1 Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Sat, 5 Mar 2022 19:03:20 +0100
Subject: [PATCH] Fix next turn button disabled after leaving sub-screens from
 menu (#6261)

---
 .../mainmenu/WorldScreenMenuPopup.kt          | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt b/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt
index 9496687837..50a1f5a6aa 100644
--- a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt
+++ b/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt
@@ -15,20 +15,38 @@ class WorldScreenMenuPopup(val worldScreen: WorldScreen) : Popup(worldScreen) {
     init {
         defaults().fillX()
 
-        addButton("Main menu") { worldScreen.game.setScreen(MainMenuScreen()) }
-        addButton("Civilopedia") { worldScreen.game.setScreen(CivilopediaScreen(worldScreen.gameInfo.ruleSet, worldScreen)) }
-        addButton("Save game") { worldScreen.game.setScreen(SaveGameScreen(worldScreen.gameInfo)) }
-        addButton("Load game") { worldScreen.game.setScreen(LoadGameScreen(worldScreen)) }
+        addButton("Main menu") {
+            worldScreen.game.setScreen(MainMenuScreen())
+        }
+        addButton("Civilopedia") {
+            close()
+            worldScreen.game.setScreen(CivilopediaScreen(worldScreen.gameInfo.ruleSet, worldScreen))
+        }
+        addButton("Save game") {
+            close()
+            worldScreen.game.setScreen(SaveGameScreen(worldScreen.gameInfo))
+        }
+        addButton("Load game") {
+            close()
+            worldScreen.game.setScreen(LoadGameScreen(worldScreen))
+        }
 
         addButton("Start new game") {
+            close()
             val newGameSetupInfo = GameSetupInfo(worldScreen.gameInfo)
             newGameSetupInfo.mapParameters.reseed()
             val newGameScreen = NewGameScreen(worldScreen, newGameSetupInfo)
             worldScreen.game.setScreen(newGameScreen)
         }
 
-        addButton("Victory status") { worldScreen.game.setScreen(VictoryScreen(worldScreen)) }
-        addButton("Options") { worldScreen.openOptionsPopup() }
+        addButton("Victory status") {
+            close()
+            worldScreen.game.setScreen(VictoryScreen(worldScreen))
+        }
+        addButton("Options") {
+            close()
+            worldScreen.openOptionsPopup()
+        }
         addButton("Community") {
             close()
             WorldScreenCommunityPopup(worldScreen).open(force = true)