X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/10f779bd487379e0a9aec80e586c562e2ac71273..7f070068aa203cb95252b641b1c0cc5308a604ee:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index e9a73ac1..0abb42a8 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -89,7 +89,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():
@@ -177,7 +179,7 @@ class TimerEditList(Screen):
 		def eol_compare(x, y):
 			if x[0].state != y[0].state and x[0].state == RealTimerEntry.StateEnded or y[0].state == RealTimerEntry.StateEnded:
 				return cmp(x[0].state, y[0].state)
-			return cmp(x[0].begin, x[1].begin)
+			return cmp(x[0].begin, y[0].begin)
 
 		list = self.list
 		del list[:]