move more code to onCreate

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 8714dd633561921549c1a1b97e1a1b3b9c55e5bb..93b55a8e8ff56ca512a8482612568b5972f69bcc 100644 (file)
--- 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'))
 
                #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):
                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):
                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():
                lastservice=eServiceReference(config.tv.lastservice.value)
                if lastservice.valid():

+                       self.session.nav.playService(lastservice)

                        self.servicelist.setCurrent(lastservice)
 
        def onShow(self):
                        self.servicelist.setCurrent(lastservice)
 
        def onShow(self):