X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5db2dc5c63948651b3e4b337d7057cd940ccc644..10f042bc5176b25dd067e57006647e769ec171da:/lib/python/Components/EpgList.py

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index ba8d0291..e0d5227c 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -99,12 +99,16 @@ class EPGList(HTMLComponent, GUIComponent):
 					pass
 
 	GUI_WIDGET = eListbox
-	
+
 	def postWidgetCreate(self, instance):
 		instance.setWrapAround(True)
 		instance.selectionChanged.get().append(self.selectionChanged)
 		instance.setContent(self.l)
 
+	def preWidgetRemove(self, instance):
+		instance.selectionChanged.get().remove(self.selectionChanged)
+		instance.setContent(None)
+
 	def recalcEntrySize(self):
 		esize = self.l.getItemSize()
 		self.l.setFont(0, gFont("Regular", 22))
@@ -132,7 +136,7 @@ class EPGList(HTMLComponent, GUIComponent):
 			self.service_rect = Rect(width/20*7, 0, width/20*13, height)
 
 	def buildSingleEntry(self, service, eventId, beginTime, duration, EventName):
-		rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) 
+		rec=beginTime and (self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) 
 		r1=self.weekday_rect
 		r2=self.datetime_rect
 		r3=self.descr_rect
@@ -148,7 +152,7 @@ class EPGList(HTMLComponent, GUIComponent):
 		return res
 
 	def buildSimilarEntry(self, service, eventId, beginTime, service_name, duration):
-		rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) 
+		rec=beginTime and (self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) 
 		r1=self.weekday_rect
 		r2=self.datetime_rect
 		r3=self.service_rect
@@ -200,7 +204,7 @@ class EPGList(HTMLComponent, GUIComponent):
 	def fillMultiEPG(self, services, stime=-1):
 		t = time()
 		test = [ (service.ref.toString(), 0, stime) for service in services ]
-		test.insert(0, '0RIBDTCn')
+		test.insert(0, 'X0RIBDTCn')
 		self.list = self.queryEPG(test)
 		self.l.setList(self.list)
 		print time() - t
@@ -209,7 +213,7 @@ class EPGList(HTMLComponent, GUIComponent):
 	def updateMultiEPG(self, direction):
 		t = time()
 		test = [ x[3] and (x[1], direction, x[3]) or (x[1], direction, 0) for x in self.list ]
-		test.insert(0, 'RIBDTCn')
+		test.insert(0, 'XRIBDTCn')
 		tmp = self.queryEPG(test)
 		cnt=0
 		for x in tmp: