fix
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Wed, 7 Dec 2005 00:09:45 +0000 (00:09 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Wed, 7 Dec 2005 00:09:45 +0000 (00:09 +0000)
lib/python/Screens/ChannelSelection.py

index 03182ab..415b100 100644 (file)
@@ -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())