From 966de236f451128b611ce8ec2ff57b222c6d58b0 Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Wed, 15 Apr 2020 22:33:12 +0200
Subject: [PATCH] Options: Turning on city production autoassign affects world
 immediately (#2401)

* Options: Turning on city production autoassign affects world immediately

* Options: Turning on city production autoassign affects world immediately - patch
---
 .../ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt b/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt
index c21c85a0da..8a8ea3d03b 100644
--- a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt
+++ b/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt
@@ -114,8 +114,13 @@ class WorldScreenOptionsPopup(val worldScreen:WorldScreen) : Popup(worldScreen)
         addYesNoRow ("Move units with a single tap", settings.singleTapMove) {
             settings.singleTapMove = it
         }
-        addYesNoRow ("Auto-assign city production", settings.autoAssignCityProduction) {
+        addYesNoRow ("Auto-assign city production", settings.autoAssignCityProduction, true) {
             settings.autoAssignCityProduction = it
+            if (it && worldScreen.viewingCiv.isCurrentPlayer() && worldScreen.viewingCiv.playerType == PlayerType.Human) {
+                UncivGame.Current.gameInfo.currentPlayerCiv.cities.forEach {
+                    city -> city.cityConstructions.chooseNextConstruction()
+                }
+            }
         }
         addYesNoRow ("Auto-build roads", settings.autoBuildingRoads) {
             settings.autoBuildingRoads = it