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 3cc459238de60c6b6526d349c3b99fe555d500f0..a038cdf0e1a1e7f2878f94172aeaca5f0d9512c7 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -112,11 +112,11 @@ class Menu(Screen):
 
                self.openDialog(*eval(arg[1]))
 
 
                self.openDialog(*eval(arg[1]))
 

-       def nothing(self):                                                                                                                                      #dummy
+       def nothing(self): #dummy

                pass
 
        def openDialog(self, *dialog):                          # in every layer needed
                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)
 
        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 __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