diff options
Diffstat (limited to 'lib/python/Screens/TimerEntry.py')
| -rw-r--r-- | lib/python/Screens/TimerEntry.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 31a65a30..c4dfff72 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -302,9 +302,13 @@ class TimerEntry(Screen, ConfigListScreen): if self.timerentry_day[x].value: self.timer.setRepeated(x) - self.timer.repeatedbegindate = self.buildRepeatedBegin(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value) - self.timer.begin = self.getTimestamp(time(), self.timerentry_starttime.value) - self.timer.end = self.getTimestamp(time(), self.timerentry_endtime.value) + self.timer.repeatedbegindate = self.getTimestamp(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value) + if self.timer.repeated: + self.timer.begin = self.getTimestamp(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value) + self.timer.end = self.getTimestamp(self.timerentry_repeatedbegindate.value, self.timerentry_endtime.value) + else: + self.timer.begin = self.getTimestamp(time.time(), self.timerentry_starttime.value) + self.timer.end = self.getTimestamp(time.time(), self.timerentry_endtime.value) # when a timer end is set before the start, add 1 day if self.timer.end < self.timer.begin: |