aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens/TimerEdit.py
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2011-03-10 13:13:34 +0100
committerghost <andreas.monzner@multimedia-labs.de>2011-03-10 13:17:42 +0100
commit160fbbc42122524635b333b5edce3695bbce3b69 (patch)
tree39520b46568843b1798fac35d192e1deb75a43a3 /lib/python/Screens/TimerEdit.py
parent7b18f1a98a22bf92567d26770b444bf911e4f55b (diff)
downloadenigma2-160fbbc42122524635b333b5edce3695bbce3b69.tar.gz
enigma2-160fbbc42122524635b333b5edce3695bbce3b69.zip
more robust timer sanity check / autoincrement handling, small code cleanup
fixes bug #718
Diffstat (limited to 'lib/python/Screens/TimerEdit.py')
-rw-r--r--lib/python/Screens/TimerEdit.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index bf60496f..572f14b5 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -88,7 +88,9 @@ class TimerEditList(Screen):
if not timersanitycheck.check():
t.disable()
print "Sanity check failed"
- self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList())
+ simulTimerList = timersanitycheck.getSimulTimerList()
+ if simulTimerList is not None:
+ self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, simulTimerList)
else:
print "Sanity check passed"
if timersanitycheck.doubleCheck():