leave menu with menu button

diff --git a/data/keymap.xml b/data/keymap.xml
index 221f1552e707972439461af63a6d0a72db7ee972..fa8293eaf89f8ea8f13cdbdd544c89cb222d3469 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -86,6 +86,10 @@
                <key id="KEY_MENU" mapto="mainMenu" flags="mr" />
        </map>
        
+       <map context="MenuActions">
+               <key id="KEY_MENU" mapto="menu" flags="mr" />
+       </map>
+       
        <map context="InfobarShowHideActions">
                <key id="KEY_OK" mapto="toggleShow" flags="m" />
                <key id="KEY_EXIT" mapto="hide" flags="m" />

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 7554d814b73d7cc2eee53416e1e78d46395dc47f..0abc1735ffe6c50da49e1a096ea74c66e981dfe4 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -139,10 +139,11 @@ class Menu(Screen):
 
                self["menu"] = MenuList(list)   
                                                        
-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
                        {
                                "ok": self.okbuttonClick,
-                               "cancel": self.close
+                               "cancel": self.close,
+                               "menu": self.close
                        })
                
                a = getValbyAttr(parent, "title")