Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Screens / Standby.py

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index d09f28afb95a19ae78c2f22f61196e5e36eaadef..b8ccb6c2e219d9644e9f8e8a46adb0ce06ef8f29 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -45,10 +45,19 @@ class Standby(Screen):
 
                #mute adc
                self.setMute()
-               #get currently playing service reference
-               self.prev_running_service = self.session.nav.getCurrentlyPlayingServiceReference()
-               #stop actual played dvb-service
-               self.session.nav.stopService()
+
+               self.paused_service = None
+               self.prev_running_service = None
+               if self.session.current_dialog:
+                       if self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_STOPS:
+                               #get currently playing service reference
+                               self.prev_running_service = self.session.nav.getCurrentlyPlayingServiceReference()
+                               #stop actual played dvb-service
+                               self.session.nav.stopService()
+                       elif self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_PAUSES:
+                               self.paused_service = self.session.current_dialog
+                               self.paused_service.pauseService()
+
                #set input to vcr scart
                if SystemInfo["ScartSwitch"]:
                        self.avswitch.setInput("SCART")
@@ -63,6 +72,8 @@ class Standby(Screen):
        def __onClose(self):
                if self.prev_running_service:
                        self.session.nav.playService(self.prev_running_service)
+               elif self.paused_service:
+                       self.paused_service.unPauseService()
 
        def createSummary(self):
                return StandbySummary
@@ -70,10 +81,12 @@ class Standby(Screen):
        def __onShow(self):
                global inStandby
                inStandby = self
+               self.session.screen["Standby"].boolean = True
 
        def __onHide(self):
                global inStandby
                inStandby = None
+               self.session.screen["Standby"].boolean = False
 
 class StandbySummary(Screen):
        skin = """
@@ -87,9 +100,6 @@ class StandbySummary(Screen):
                </widget>
        </screen>"""
 
-       def __init__(self, session, parent):
-               Screen.__init__(self, session)
-
 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox
 from time import time
@@ -100,7 +110,7 @@ inTryQuitMainloop = False
 class TryQuitMainloop(MessageBox):
        def __init__(self, session, retvalue=1, timeout=-1, default_yes = True):
                self.retval=retvalue
-               recordings = len(session.nav.getRecordings())
+               recordings = session.nav.getRecordings()
                jobs = len(job_manager.getPendingJobs())
                self.connected = False
                reason = ""
@@ -137,7 +147,7 @@ class TryQuitMainloop(MessageBox):
        def getRecordEvent(self, recservice, event):
                if event == iRecordableService.evEnd:
                        recordings = self.session.nav.getRecordings()
-                       if not len(recordings): # no more recordings exist
+                       if not recordings: # no more recordings exist
                                rec_time = self.session.nav.RecordTimer.getNextRecordingTime()
                                if rec_time > 0 and (rec_time - time()) < 360:
                                        self.initTimeout(360) # wait for next starting timer
@@ -152,9 +162,14 @@ class TryQuitMainloop(MessageBox):
                        self.conntected=False
                        self.session.nav.record_event.remove(self.getRecordEvent)
                if value:
-                       quitMainloop(self.retval)
-               else:
-                       MessageBox.close(self, True)
+                       # hack .. we dont like to show any other screens when this screen has closed
+                       self.onClose = [self.__closed]
+                       self.session.dialog_stack = []
+                       self.session.summary_stack = [None]
+               MessageBox.close(self, True)
+
+       def __closed(self):
+               quitMainloop(self.retval)
 
        def __onShow(self):
                global inTryQuitMainloop