Fixed issue with certain buttons not exiting properly.

Jasonra · Jan 27, 2012 · 0b4c37f · 0b4c37f
1 parent 530a102
commit 0b4c37f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/config.py b/config.py
@@ -78,7 +78,7 @@ def onFocus(self, controlId):
     def onAction(self, act):
         action = act.getId()
 
-        if action == ACTION_PREVIOUS_MENU:
+        if action in ACTION_PREVIOUS_MENU:
             if self.showingList == False:
                 self.cancelChan()
                 self.hideChanDetails()

diff --git a/resources/lib/AdvancedConfig.py b/resources/lib/AdvancedConfig.py
@@ -72,7 +72,7 @@ def onAction(self, act):
         if focusid >= 160:
             self.getControl(focusid).setLabel(self.ruleList[self.selectedRuleIndex].onAction(act, (focusid - 160) + (self.optionRowOffset * 2)))
 
-        if action == ACTION_PREVIOUS_MENU:
+        if action in ACTION_PREVIOUS_MENU:
             if self.selectedRuleIndex > -1:
                 xbmc.executebuiltin("SetProperty(itempress,100)")
                 xbmc.executebuiltin("Control.SetFocus(120)")

diff --git a/resources/lib/EPGWindow.py b/resources/lib/EPGWindow.py
@@ -372,7 +372,7 @@ def onAction(self, act):
         action = act.getId()
 
         try:
-            if action == ACTION_PREVIOUS_MENU:
+            if action in ACTION_PREVIOUS_MENU:
                 self.closeEPG()
             elif action == ACTION_MOVE_DOWN:
                 self.GoDown()

diff --git a/resources/lib/Globals.py b/resources/lib/Globals.py
@@ -110,7 +110,7 @@ def log(msg, level = xbmc.LOGDEBUG):
 ACTION_PAGEUP = 5
 ACTION_PAGEDOWN = 6
 ACTION_SELECT_ITEM = 7
-ACTION_PREVIOUS_MENU = 10
+ACTION_PREVIOUS_MENU = (9, 10, 92, 216, 247, 257, 275, 61467, 61448,)
 ACTION_SHOW_INFO = 11
 ACTION_PAUSE = 12
 ACTION_STOP = 13

diff --git a/resources/lib/Overlay.py b/resources/lib/Overlay.py
@@ -695,7 +695,7 @@ def onAction(self, act):
                 self.showInfo(10.0)
             else:
                 xbmc.executebuiltin("PlayerControl(SmallSkipForward)")
-        elif action == ACTION_PREVIOUS_MENU:
+        elif action in ACTION_PREVIOUS_MENU:
             if self.showingInfo:
                 self.hideInfo()
             else: