From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Mon, 30 Oct 2006 16:03:37 +0000 (+0000)
Subject: recursive close Menu when a screen returns true at close
X-Git-Tag: 2.6.0~2817
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/59567589c05c2756dcf779cc24aa86becd63a68c

recursive close Menu when a screen returns true at close
---

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 3cc45923..a038cdf0 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -112,11 +112,11 @@ class Menu(Screen):
 
 		self.openDialog(*eval(arg[1]))
 
-	def nothing(self):																	#dummy
+	def nothing(self): #dummy
 		pass
 
 	def openDialog(self, *dialog):				# in every layer needed
-		self.session.open(*dialog)
+		self.session.openWithCallback(self.menuClosed, *dialog)
 
 	def openSetup(self, dialog):
 		self.session.openWithCallback(self.menuClosed, Setup, dialog)
@@ -241,21 +241,3 @@ class MainMenu(Menu):
 	def __init__(self, *x):
 		Menu.__init__(self, *x)
 		self.skinName = "Menu"
-
-	def openDialog(self, dialog):
-		self.session.open(dialog)
-
-	def openSetup(self, dialog):
-		self.session.open(Setup, dialog)
-
-	def setModeTV(self):
-		print "set Mode to TV"
-		pass
-
-	def setModeRadio(self):
-		print "set Mode to Radio"
-		pass
-
-	def setModeFile(self):
-		print "set Mode to File"
-		pass