X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTimerEdit.py;h=0abb42a81fe5a07da0101e50876fa1d6d4f07c1e;hp=6e8859eeec0f3107873a0f8a8e256d94b70f1034;hb=HEAD;hpb=33a8f42447b5f3655b47f15f7c2a4cf45af5c4bb

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 6e8859e..0abb42a 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -13,7 +13,7 @@ from ServiceReference import ServiceReference
 from TimerEntry import TimerEntry, TimerLog
 from Tools.BoundFunction import boundFunction
 from time import time
-from timer import TimerEntry
+from timer import TimerEntry as RealTimerEntry
 
 class TimerEditList(Screen):
 	EMPTY = 0
@@ -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():
@@ -175,9 +177,9 @@ class TimerEditList(Screen):
 	def fillTimerList(self):
 		#helper function to move finished timers to end of list
 		def eol_compare(x, y):
-			if x[0].state != y[0].state and x[0].state == TimerEntry.StateEnded or y[0].state == TimerEntry.StateEnded:
+			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[:]