diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-10-18 17:11:52 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-10-18 17:11:52 +0000 |
| commit | 44c32e4101acdeb6df3833f35e9c0719e993a2a5 (patch) | |
| tree | 08aedc616913a082a1fdf23e287ba72f1379f121 /lib/python/Screens/TimerEntry.py | |
| parent | 1751c1f87548c3677b636e6e1c51866823e83cd4 (diff) | |
| download | enigma2-44c32e4101acdeb6df3833f35e9c0719e993a2a5.tar.gz enigma2-44c32e4101acdeb6df3833f35e9c0719e993a2a5.zip | |
add timeroverlap detection made by adenin (thanks for the great work!)
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: |