diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-09 15:11:44 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-09 15:11:44 +0100 |
| commit | f0fa458aa15610408a16f3214a6e857f16b0c646 (patch) | |
| tree | 21b074b6f61ff032275d01226460764f317a1a1a | |
| parent | 7211bd40026fb8b00be038a59abcbfa29569b3ed (diff) | |
| parent | bceeb1e944f82724d3cdcf1871f29d8926386dbc (diff) | |
| download | enigma2-f0fa458aa15610408a16f3214a6e857f16b0c646.tar.gz enigma2-f0fa458aa15610408a16f3214a6e857f16b0c646.zip | |
Merge branch 'bug_635_timer_sanity_check_speedup'
| -rwxr-xr-x | RecordTimer.py | 2 | ||||
| -rw-r--r-- | lib/python/Components/TimerSanityCheck.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/RecordTimer.py b/RecordTimer.py index 4ece9c58..1cb7eb3b 100755 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -517,7 +517,7 @@ class RecordTimer(timer.Timer): checkit = True for timer in root.findall("timer"): newTimer = createTimer(timer) - if (self.record(newTimer, True, True) is not None) and (checkit == True): + if (self.record(newTimer, True, dosave=False) is not None) and (checkit == True): from Tools.Notifications import AddPopup from Screens.MessageBox import MessageBox AddPopup(_("Timer overlap in timers.xml detected!\nPlease recheck it!"), type = MessageBox.TYPE_ERROR, timeout = 0, id = "TimerLoadFailed") diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py index b472a19e..b9dda6a6 100644 --- a/lib/python/Components/TimerSanityCheck.py +++ b/lib/python/Components/TimerSanityCheck.py @@ -2,6 +2,7 @@ import NavigationInstance from time import localtime, mktime, gmtime from ServiceReference import ServiceReference from enigma import iServiceInformation, eServiceCenter, eServiceReference +from timer import TimerEntry class TimerSanityCheck: def __init__(self, timerlist, newtimer=None): @@ -107,7 +108,7 @@ class TimerSanityCheck: self.rep_eventlist.append((begin, idx)) begin += 86400 rflags >>= 1 - else: + elif timer.state < TimerEntry.StateEnded: self.nrep_eventlist.extend([(timer.begin,self.bflag,idx),(timer.end,self.eflag,idx)]) idx += 1 |