X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5aca87ce699f59f418740a2f073f1056d8239dad..87b1a41106c4561a400536558d10dc703b3f81f4:/lib/python/Components/EpgList.py

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 52fd9190..ba8d0291 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -1,9 +1,11 @@
 from HTMLComponent import HTMLComponent
 from GUIComponent import GUIComponent
 
-from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, loadPNG, \
+from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, \
 	RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER
 
+from Tools.LoadPixmap import LoadPixmap
+
 from time import localtime, time
 from ServiceReference import ServiceReference
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
@@ -49,7 +51,7 @@ class EPGList(HTMLComponent, GUIComponent):
 			assert(type == EPG_TYPE_SIMILAR)
 			self.l.setBuildFunc(self.buildSimilarEntry)
 		self.epgcache = eEPGCache.getInstance()
-		self.clock_pixmap = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))
+		self.clock_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))
 
 	def getEventFromId(self, service, eventid):
 		event = None
@@ -232,7 +234,7 @@ class EPGList(HTMLComponent, GUIComponent):
 		if len(self.list):
 			if type == 1:
 				event_id = self.getSelectedEventId()
-				self.list.sort(key=lambda x: (x[4].lower(), x[2]))
+				self.list.sort(key=lambda x: (x[4] and x[4].lower(), x[2]))
 				self.l.setList(self.list)
 				self.moveToEventId(event_id)
 			else: