diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
| commit | a4b8eb676ba549ebe8cf347f15888e51d8914789 (patch) | |
| tree | f88416c61e96ec26675c8817a6961a74207f0f7b /RecordTimer.py | |
| parent | dce87891f204f8e1f7151c4a3ba00b9dd048e795 (diff) | |
| parent | c46312d7f5ce4113ece4c33595b7192eccadcb1d (diff) | |
| download | enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.tar.gz enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/python/Screens/InfoBarGenerics.py
Diffstat (limited to 'RecordTimer.py')
| -rw-r--r-- | RecordTimer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/RecordTimer.py b/RecordTimer.py index 897c281a..f8e0dbd7 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -363,7 +363,7 @@ class RecordTimerEntry(timer.TimerEntry, object): elif event == iRecordableService.evStart: text = _("A record has been started:\n%s") % self.name if self.dirnameHadToFallback: - text = '\n'.join([text, _("Please note that the previously selected media could not be accessed and therefore the default directory is being used instead.")]) + text = '\n'.join((text, _("Please note that the previously selected media could not be accessed and therefore the default directory is being used instead."))) # maybe this should be configurable? Notifications.AddPopup(text = text, type = MessageBox.TYPE_INFO, timeout = 3) @@ -657,7 +657,7 @@ class RecordTimer(timer.Timer): chktimecmp = chktime.tm_wday * 1440 + chktime.tm_hour * 60 + chktime.tm_min chktimecmp_end = chktimecmp + (duration / 60) time = localtime(x.begin) - for y in range(7): + for y in (0, 1, 2, 3, 4, 5, 6): if x.repeated & (2 ** y): timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)): |