From 21f9df63ddab9df5d54c9e1925308753b1753b0b Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 7 Jun 2020 22:19:22 +0300
Subject: [PATCH] Clicking the menu button when it is open closes the menu -
 #2706

---
 core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
index 70d2242f8e..8427d997c9 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
@@ -120,8 +120,10 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() {
                 .apply { setSize(50f, 50f) }
         menuButton.color = Color.WHITE
         menuButton.onClick {
-            if (worldScreen.popups.none { it is WorldScreenMenuPopup })
-                WorldScreenMenuPopup(worldScreen).open(force = true)
+            val worldScreenMenuPopup = worldScreen.popups.firstOrNull { it is WorldScreenMenuPopup }
+            if(worldScreenMenuPopup!=null)
+                worldScreenMenuPopup.close()
+            else WorldScreenMenuPopup(worldScreen).open(force = true)
         }
         menuButton.centerY(this)
         menuButton.x = menuButton.y