Revert "MovieSelection: Remove identical keypressScreenSaver method"
authorlittlesat <littlesat99@yahoo.com>
Sun, 31 May 2015 10:54:43 +0000 (12:54 +0200)
committerlittlesat <littlesat99@yahoo.com>
Sun, 31 May 2015 10:54:43 +0000 (12:54 +0200)
This reverts commit 6d19d448e5d44d21cae5674d446811e623591972.

As it breaks playing MP3s to the end on at least the ET10K

lib/python/Screens/MovieSelection.py

index d6fe1f6..c292193 100644 (file)
@@ -505,8 +505,8 @@ class MovieSelectionSummary(Screen):
                        self["name"].text = ""
 
 from Screens.InfoBarGenerics import InfoBarScreenSaver
-
 class MovieSelectionScreenSaver(InfoBarScreenSaver):
+
        def ScreenSaverTimerStart(self):
                time = int(config.usage.screen_saver.value)
                if time:
@@ -518,6 +518,13 @@ class MovieSelectionScreenSaver(InfoBarScreenSaver):
                                        return
                self.screenSaverTimer.stop()
 
+       def keypressScreenSaver(self, key, flag):
+               if flag:
+                       self.screensaver.hide()
+                       self.show()
+                       self.ScreenSaverTimerStart()
+                       eActionMap.getInstance().unbindAction('', self.keypressScreenSaver)
+
 class MovieSelection(Screen, HelpableScreen, SelectionEventInfo, InfoBarBase, ProtectedScreen, MovieSelectionScreenSaver):
        # SUSPEND_PAUSES actually means "please call my pauseService()"
        ALLOW_SUSPEND = Screen.SUSPEND_PAUSES