aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-12-07 00:09:45 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-12-07 00:09:45 +0000
commitbae52d13acd843bb03c6037433a34720fc6d471f (patch)
tree39071a1f6bb2ffc31d2ba678d8c533ff104e2fee /lib/python
parent00e833f8ab8c769cc802a050810f4976c99f9a5f (diff)
downloadenigma2-bae52d13acd843bb03c6037433a34720fc6d471f.tar.gz
enigma2-bae52d13acd843bb03c6037433a34720fc6d471f.zip
fix
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/ChannelSelection.py6
1 files changed, 3 insertions, 3 deletions
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())