From 962b249aab7d6be0a4d6b9c8605a3ac60a13aa6c Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Wed, 7 Dec 2005 01:19:58 +0000 Subject: [PATCH] move more code to onCreate --- lib/python/Screens/ChannelSelection.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 8714dd63..93b55a8e 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -333,16 +333,6 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): #allways defaults to fav #self.servicelist.setRoot(eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')) - lastroot=eServiceReference(config.tv.lastroot.value) - if lastroot.valid(): - self.setRoot(lastroot) - else: - self.showFavourites() - - lastservice=eServiceReference(config.tv.lastservice.value) - if lastservice.valid(): - self.session.nav.playService(lastservice) - class ChannelActionMap(NumberActionMap): def action(self, contexts, action): if not self.csel.enterBouquet(action): @@ -376,8 +366,14 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): self.onLayoutFinish.append(self.onCreate) def onCreate(self): + lastroot=eServiceReference(config.tv.lastroot.value) + if lastroot.valid(): + self.setRoot(lastroot) + else: + self.showFavourites() lastservice=eServiceReference(config.tv.lastservice.value) if lastservice.valid(): + self.session.nav.playService(lastservice) self.servicelist.setCurrent(lastservice) def onShow(self): -- 2.30.2