From 0a9814e3b8a256aec8b3c441516ed8751420db5f Mon Sep 17 00:00:00 2001
From: Gualdimar <Gualdimar@users.noreply.github.com>
Date: Tue, 14 Mar 2023 18:28:47 +0200
Subject: [PATCH] Minimap hotseat fix (#8894)

---
 core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
index 76673fee84..066f25aa01 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
@@ -382,6 +382,8 @@ class WorldScreen(
         if(uiEnabled){
             displayTutorialsOnUpdate()
 
+            updateSelectedCiv()
+
             if (fogOfWar) minimapWrapper.update(selectedCiv)
             else minimapWrapper.update(viewingCiv)
 
@@ -391,8 +393,6 @@ class WorldScreen(
             bottomTileInfoTable.y = if (game.settings.showMinimap) minimapWrapper.height else 0f
             battleTable.update()
 
-            updateSelectedCiv()
-
             displayTutorialTaskOnUpdate()
 
             unitActionsTable.update(bottomUnitTable.selectedUnit)
@@ -564,7 +564,7 @@ class WorldScreen(
         when {
             bottomUnitTable.selectedUnit != null -> selectedCiv = bottomUnitTable.selectedUnit!!.civ
             bottomUnitTable.selectedCity != null -> selectedCiv = bottomUnitTable.selectedCity!!.civ
-            else -> viewingCiv
+            else -> selectedCiv = viewingCiv
         }
     }