From b0830ba4878f863743272905484691e8d7c39e64 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 29 Mar 2019 15:20:30 +0300
Subject: [PATCH] Resolved #613 - policy choice & city conquer collision

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

diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
index 3d94c66a18..9e65b70ed6 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
@@ -219,6 +219,9 @@ class WorldScreen : CameraStageBaseScreen() {
     private fun createNextTurnButton(): TextButton {
         val nextTurnButton = TextButton("Next turn".tr(), CameraStageBaseScreen.skin)
         nextTurnButton.onClick {
+            if(currentPlayerCiv.policies.shouldOpenPolicyPicker && !currentPlayerCiv.policies.canAdoptPolicy())
+                currentPlayerCiv.policies.shouldOpenPolicyPicker = false // something has chanhed and we can no longer adopt the policy, e.g. we conquered another city
+
             if (currentPlayerCiv.tech.freeTechs != 0) {
                 game.screen = TechPickerScreen(true, currentPlayerCiv)
                 return@onClick