diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2007-12-16 20:46:40 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2007-12-16 20:46:40 +0000 |
| commit | 09e63023b69cc20fbc1c59826990abe9a7969418 (patch) | |
| tree | 279748e2f842c27e145f2d06712e48800c41d96e /lib/python | |
| parent | f359297fea04265130c187206da39db5beb9e675 (diff) | |
| download | enigma2-09e63023b69cc20fbc1c59826990abe9a7969418.tar.gz enigma2-09e63023b69cc20fbc1c59826990abe9a7969418.zip | |
patch by Pieter Grimmerink: fix 'cancel' when editing the service reference in a timer
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Screens/TimerEntry.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index c6779e73..3541d36d 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -109,6 +109,7 @@ class TimerEntry(Screen, ConfigListScreen): servicename = str(self.timer.service_ref.getServiceName()) except: pass + self.timerentry_service_ref = self.timer.service_ref self.timerentry_service = ConfigSelection([servicename]) self.timerentry_startdate.addNotifier(self.checkDate) @@ -215,8 +216,8 @@ class TimerEntry(Screen, ConfigListScreen): def finishedChannelSelection(self, *args): if len(args): - self.timer.service_ref = ServiceReference(args[0]) - self.timerentry_service.setCurrentText(self.timer.service_ref.getServiceName()) + self.timerentry_service_ref = ServiceReference(args[0]) + self.timerentry_service.setCurrentText(self.timerentry_service_ref.getServiceName()) self["config"].invalidate(self.channelEntry) def getTimestamp(self, date, mytime): @@ -252,7 +253,8 @@ class TimerEntry(Screen, ConfigListScreen): self.timer.justplay = self.timerentry_justplay.value == "zap" self.timer.resetRepeated() self.timer.afterEvent = {"nothing": AFTEREVENT.NONE, "deepstandby": AFTEREVENT.DEEPSTANDBY, "standby": AFTEREVENT.STANDBY}[self.timerentry_afterevent.value] - + self.timer.service_ref = self.timerentry_service_ref + if self.timerentry_type.value == "once": self.timer.begin, self.timer.end = self.getBeginEnd() if self.timerentry_type.value == "repeated": |