git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ServiceList: allow setMode before GUIcreate
[enigma2.git]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index 9f90d1b20212236b850275e80b2cce2026dea4de..27c4e209bdfa02363ed181e41076a0cb1c6f0d14 100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-210,8
+210,8
@@
class ChannelSelectionBase(Screen):
def __init__(self, session):
Screen.__init__(self, session)
def __init__(self, session):
Screen.__init__(self, session)
- 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('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')
+
#
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('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')
self["key_red"] = Button("All")
#self["key_green"] = Button("Provider")
self["key_red"] = Button("All")
#self["key_green"] = Button("Provider")
@@
-314,6
+314,8
@@
class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
if config.tv.lastroot.value == "":
self.servicelist.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
if config.tv.lastroot.value == "":
self.servicelist.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
+ self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
+
class ChannelActionMap(NumberActionMap):
def action(self, contexts, action):
if not self.csel.enterBouquet(action):
class ChannelActionMap(NumberActionMap):
def action(self, contexts, action):
if not self.csel.enterBouquet(action):