diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-03-14 10:36:47 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-03-14 10:36:47 +0100 |
| commit | 06a1a623534d89b1fd336dbf158dd2cee4425f13 (patch) | |
| tree | abb89053fd3e3bc598d78d19de2db7e2f2ebc7dc /lib/python/Screens/TimerEdit.py | |
| parent | ed2e2fedc646e73d5f4348458901bb46b717a497 (diff) | |
| parent | 7fc419306c3d26d4d9c107ff4bbf1ffcfc157acf (diff) | |
| download | enigma2-06a1a623534d89b1fd336dbf158dd2cee4425f13.tar.gz enigma2-06a1a623534d89b1fd336dbf158dd2cee4425f13.zip | |
Merge branch 'bug_718_timer_sanitycheck_robustness'
Diffstat (limited to 'lib/python/Screens/TimerEdit.py')
| -rw-r--r-- | lib/python/Screens/TimerEdit.py | 4 |
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(): |