From a4af24105bec09c89d4bc6d15cf999822d15dbb0 Mon Sep 17 00:00:00 2001
From: alfa_addon_10 <alfa@addon.com>
Date: Thu, 7 Sep 2017 22:40:15 +0200
Subject: [PATCH] better solution, to multi instance of a window and close them

---
 plugin.video.alfa/platformcode/keymaptools.py | 47 ++++++++-----------
 .../skins/Default/720p/ShortCutMenu.xml       |  2 +-
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/plugin.video.alfa/platformcode/keymaptools.py b/plugin.video.alfa/platformcode/keymaptools.py
index 4128f8b4..5d6ecbf2 100644
--- a/plugin.video.alfa/platformcode/keymaptools.py
+++ b/plugin.video.alfa/platformcode/keymaptools.py
@@ -109,72 +109,65 @@ MAIN_MENU = {
 class Main(xbmcgui.WindowXMLDialog):
     def __init__(self, *args, **kwargs):
         self.items = []
-        self.open = kwargs.get("open")
 
     def onInit(self):
         self.setCoordinateResolution(2)
 
-        if self.open:
-            for menuentry in MAIN_MENU.keys():
-                item = xbmcgui.ListItem(MAIN_MENU[menuentry]["label"])
-                item.setProperty("thumb", str(MAIN_MENU[menuentry]["icon"]))
-                item.setProperty("identifier", str(menuentry))
-                item.setProperty("order", str(MAIN_MENU[menuentry]["order"]))
-                self.items.append(item)
+        for menuentry in MAIN_MENU.keys():
+            item = xbmcgui.ListItem(MAIN_MENU[menuentry]["label"])
+            item.setProperty("thumb", str(MAIN_MENU[menuentry]["icon"]))
+            item.setProperty("identifier", str(menuentry))
+            item.setProperty("order", str(MAIN_MENU[menuentry]["order"]))
+            self.items.append(item)
 
-            self.items.sort(key=lambda it: it.getProperty("order"))
-            self.getControl(32500).addItems(self.items)
-            self.setFocusId(32500)
-            self.open = False
+        self.items.sort(key=lambda it: it.getProperty("order"))
+        self.getControl(32500).addItems(self.items)
+        self.setFocusId(32500)
 
     def onClick(self, control_id):
         if control_id == 32500:
             identifier = self.getControl(32500).getSelectedItem().getProperty("identifier")
             if identifier == "news":
-                self.close()
+                xbmc.executebuiltin('Dialog.Close(all,true)')
                 xbmc.executebuiltin(
                     'ActivateWindow(10025, "plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAibWFpbmxpc3QiLCANCiAgICAiY2hhbm5lbCI6ICJuZXdzIg0KfQ==")')
             elif identifier == "channels":
-                self.close()
+                xbmc.executebuiltin('Dialog.Close(all,true)')
                 xbmc.executebuiltin(
                     'ActivateWindow(10025, "plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAiZ2V0Y2hhbm5lbHR5cGVzIiwgDQogICAgImNoYW5uZWwiOiAiY2hhbm5lbHNlbGVjdG9yIg0KfQ==")')
             elif identifier == "search":
-                self.close()
+                xbmc.executebuiltin('Dialog.Close(all,true)')
                 xbmc.executebuiltin(
                     'ActivateWindow(10025, "plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAibWFpbmxpc3QiLCANCiAgICAiY2hhbm5lbCI6ICJzZWFyY2giDQp9")')
             elif identifier == "favorites":
-                self.close()
+                xbmc.executebuiltin('Dialog.Close(all,true)')
                 xbmc.executebuiltin(
                     'ActivateWindow(10025, "plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAibWFpbmxpc3QiLCANCiAgICAiY2hhbm5lbCI6ICJmYXZvcml0ZXMiDQp9")')
             elif identifier == "videolibrary":
-                self.close()
+                xbmc.executebuiltin('Dialog.Close(all,true)')
                 xbmc.executebuiltin(
                     'ActivateWindow(10025, "plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAibWFpbmxpc3QiLCANCiAgICAiY2hhbm5lbCI6ICJ2aWRlb2xpYnJhcnkiDQp9")')
             elif identifier == "downloads":
-                self.close()
+                xbmc.executebuiltin('Dialog.Close(all,true)')
                 xbmc.executebuiltin(
                     'ActivateWindow(10025, "plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAibWFpbmxpc3QiLCANCiAgICAiY2hhbm5lbCI6ICJkb3dubG9hZHMiDQp9")')
             elif identifier == "settings":
-                self.close()
+                xbmc.executebuiltin('Dialog.Close(all,true)')
                 xbmc.executebuiltin(
                     'ActivateWindow(10025, "plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAibWFpbmxpc3QiLCANCiAgICAiY2hhbm5lbCI6ICJzZXR0aW5nIg0KfQ==")')
 
-            config.set_setting("shortcut_flag", "")
 
     def onAction(self, action):
         # exit
         if action.getId() in [xbmcgui.ACTION_PREVIOUS_MENU, xbmcgui.ACTION_NAV_BACK]:
             # main.close()
-            self.close()
-            config.set_setting("shortcut_flag", "")
+            xbmc.executebuiltin('Dialog.Close(all,true)')
 
         if action.getId() == xbmcgui.ACTION_CONTEXT_MENU:
             config.open_settings()
 
 
 def open_shortcut_menu():
-    if config.get_setting("shortcut_flag") != "open":
-        main = Main('ShortCutMenu.xml', config.get_runtime_path(), open=True)
-        config.set_setting("shortcut_flag", "open")
-        main.doModal()
-        del main
+    main = Main('ShortCutMenu.xml', config.get_runtime_path())
+    main.doModal()
+    del main
diff --git a/plugin.video.alfa/resources/skins/Default/720p/ShortCutMenu.xml b/plugin.video.alfa/resources/skins/Default/720p/ShortCutMenu.xml
index bc3b7dc2..a0e50b28 100644
--- a/plugin.video.alfa/resources/skins/Default/720p/ShortCutMenu.xml
+++ b/plugin.video.alfa/resources/skins/Default/720p/ShortCutMenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window type="window">
+<window>
 	<depth>0.52</depth>
 	<coordinates>
 		<left>147</left>