From: Stefan Pluecken Date: Sat, 6 May 2006 16:21:57 +0000 (+0000) Subject: add some missing changes X-Git-Tag: 2.6.0~3479 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/9bdb2bf12943594e9bcd309ed9c60e44af23dbf0 add some missing changes --- diff --git a/RecordTimer.py b/RecordTimer.py index 87aa197c..186b386c 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -42,9 +42,16 @@ class AFTEREVENT: # please do not translate log messages class RecordTimerEntry(timer.TimerEntry): - def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE): + def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False): timer.TimerEntry.__init__(self, int(begin), int(end)) + if checkOldTimers == True: + if self.begin < time.time() - 1209600: + self.begin = int(time.time()) + + if self.end < self.begin: + self.end = self.begin + assert isinstance(serviceref, ServiceReference) self.service_ref = serviceref diff --git a/data/skin_default.xml b/data/skin_default.xml index 3ed48eab..6ebc9527 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -259,8 +259,8 @@ - - + +