Re-allow go back to standby for zap timers
authorLittlesat <littlesat99@yahoo.com>
Tue, 10 Sep 2013 08:44:48 +0000 (10:44 +0200)
committerLittlesat <littlesat99@yahoo.com>
Tue, 10 Sep 2013 08:44:48 +0000 (10:44 +0200)
Navigation.py
RecordTimer.py

index 54c8c38..d870648 100644 (file)
@@ -34,7 +34,7 @@ class Navigation:
                self.RecordTimer = RecordTimer.RecordTimer()
                self.__wasTimerWakeup = getFPWasTimerWakeup()
                if self.__wasTimerWakeup:
-                       # We need to give the systemclock the chance to sync with the transponder time,
+                       # We need to give the systemclock the chance to sync with the transponder time
                        self.recordshutdowntimer = eTimer()
                        self.recordshutdowntimer.callback.append(self.checkShutdownAfterRecording)
                        self.recordshutdowntimer.startLongTimer(30)
index 4f42426..30bfb6a 100644 (file)
@@ -260,9 +260,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
                if next_state == 1:
                        if self.always_zap:
                                if Screens.Standby.inStandby:
-                                       if not config.misc.standbyCounter.value:
-                                               self.wasInStandby = True
-                                               eActionMap.getInstance().bindAction('', -maxint - 1, self.keypress)
+                                       self.wasInStandby = True
+                                       eActionMap.getInstance().bindAction('', -maxint - 1, self.keypress)
                                        #set service to zap after standby
                                        Screens.Standby.inStandby.prev_running_service = self.service_ref.ref
                                        Screens.Standby.inStandby.paused_service = None
@@ -322,9 +321,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
                                return True
                        if self.justplay:
                                if Screens.Standby.inStandby:
-                                       if not config.misc.standbyCounter.value:
-                                               self.wasInStandby = True
-                                               eActionMap.getInstance().bindAction('', -maxint - 1, self.keypress)
+                                       self.wasInStandby = True
+                                       eActionMap.getInstance().bindAction('', -maxint - 1, self.keypress)
                                        self.log(11, "wakeup and zap")
                                        #set service to zap after standby
                                        Screens.Standby.inStandby.prev_running_service = self.service_ref.ref