Fixes to miniwindows

modules/game_minimap/minimap.lua

@@ -83,16 +83,19 @@ function Minimap.terminate()
 end
 
 function Minimap.toggle()
-  local visible = not minimapWindow:isExplicitlyVisible()
-  if visible then
-    minimapWindow:open()
-    minimapButton:setOn(true)
-  else
+  if minimapButton:isOn() then
     minimapWindow:close()
     minimapButton:setOn(false)
+  else
+    minimapWindow:open()
+    minimapButton:setOn(true)
   end
 end
 
+function Minimap.onMiniWindowClose()
+  minimapButton:setOn(false)
+end
+
 function Minimap.reset()
   local player = g_game.getLocalPlayer()
   if not player then return end

modules/game_minimap/minimap.otui

@@ -3,6 +3,8 @@ MiniWindow
   !text: tr('Minimap')
   height: 150
   icon: minimap.png
+  @onClose: Minimap.onMiniWindowClose()
+  &save: true
 
   MiniWindowContents
     padding: 3