From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Wed, 4 Jan 2006 22:28:36 +0000 (+0000)
Subject: leave menu with menu button
X-Git-Tag: 2.6.0~4523
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/3ed2a2a7ae8652da1b60f0cb080037ac38699544

leave menu with menu button
---

diff --git a/data/keymap.xml b/data/keymap.xml
index 221f1552..fa8293ea 100644
--- 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 7554d814..0abc1735 100644
--- 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")