From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Wed, 7 Dec 2005 00:09:45 +0000 (+0000)
Subject: fix
X-Git-Tag: 2.6.0~4806
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/bae52d13acd843bb03c6037433a34720fc6d471f?hp=00e833f8ab8c769cc802a050810f4976c99f9a5f

fix
---

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 03182ab8..415b1000 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -217,8 +217,8 @@ class ChannelSelectionBase(Screen):
 
 		self.service_types = self.service_types_tv
 
-		#self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
-		self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+		self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+		#self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
 
 		self["key_red"] = Button("All")
 		self["key_green"] = Button("Satellites")
@@ -368,7 +368,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 
 	def onShow(self):
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
-		if ref.valid() and ref.getPath() == "":
+		if ref is not None and ref.valid() and ref.getPath() == "":
 			self.servicelist.setPlayableIgnoreService(ref)
 		else:
 			self.servicelist.setPlayableIgnoreService(eServiceReference())