fix memleak in dvb subtitle code

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 79dd6277a2e5dff5e480683859af9be32d536447..38e18d692d65bc573f9df7bcf69f1bea2e0f341b 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -404,18 +404,22 @@ class PowerKey:
                globalActionMap.actions["power_down"]=self.powerdown
                globalActionMap.actions["power_up"]=self.powerup
                globalActionMap.actions["power_long"]=self.powerlong
+               globalActionMap.actions["deepstandby"]=self.shutdown # frontpanel long power button press
                self.standbyblocked = 1
 
        def MenuClosed(self, *val):
                self.session.infobar = None
 
+       def shutdown(self):
+               print "PowerOff - Now!"
+               if not Screens.Standby.inTryQuitMainloop:
+                       self.session.open(Screens.Standby.TryQuitMainloop, 1)
+               
        def powerlong(self):
                self.standbyblocked = 1
                action = config.usage.on_long_powerpress.value
                if action == "shutdown":
-                       print "PowerOff - Now!"
-                       if not Screens.Standby.inTryQuitMainloop:
-                               self.session.open(Screens.Standby.TryQuitMainloop, 1)
+                       self.shutdown()
                elif action == "show_menu":
                        print "Show shutdown Menu"
                        menu = mdom.childNodes[0]
@@ -430,8 +434,8 @@ class PowerKey:
                                                        id = y.getAttribute("val")
                                                        if id and id == "shutdown":
                                                                self.session.infobar = self
-                                                               menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, menu, x.childNodes)
-                                                               menu_screen.setTitle(_("Standby Menu"))
+                                                               menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x, x.childNodes)
+                                                               menu_screen.setTitle(_("Standby / Restart"))
                                                                return
 
        def powerdown(self):