From 1119968f59b6eeeb546ee2d57b9bfca19a67315c Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 30 Jan 2020 20:16:05 +0200
Subject: [PATCH] Resolved #1808 - Disabled declaration of friendship

---
 core/src/com/unciv/logic/automation/NextTurnAutomation.kt | 2 +-
 core/src/com/unciv/ui/mapeditor/MapDownloadPopup.kt       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
index 48a806121b..192b069701 100644
--- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
+++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
@@ -26,7 +26,7 @@ class NextTurnAutomation{
         respondToTradeRequests(civInfo)
 
         if(civInfo.isMajorCiv()) {
-            offerDeclarationOfFriendship(civInfo)
+//            offerDeclarationOfFriendship(civInfo)
             offerPeaceTreaty(civInfo)
             offerResearchAgreement(civInfo)
             exchangeTechs(civInfo)
diff --git a/core/src/com/unciv/ui/mapeditor/MapDownloadPopup.kt b/core/src/com/unciv/ui/mapeditor/MapDownloadPopup.kt
index 3e019c8c96..df058c42ff 100644
--- a/core/src/com/unciv/ui/mapeditor/MapDownloadPopup.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapDownloadPopup.kt
@@ -34,6 +34,9 @@ class MapDownloadPopup(loadMapScreen: LoadMapScreen): Popup(loadMapScreen) {
                     scrollableMapTable.add(downloadMapButton).row()
                 }
                 contentTable.add(ScrollPane(scrollableMapTable)).height(screen.stage.height * 2 / 3).row()
+                pack()
+                close()
+                open()
             }
         } catch (ex: Exception) {
             addGoodSizedLabel("Could not get list of maps!").row()