From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Wed, 7 Dec 2005 01:19:58 +0000 (+0000)
Subject: move more code to onCreate
X-Git-Tag: 2.6.0~4802
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/962b249aab7d6be0a4d6b9c8605a3ac60a13aa6c?hp=b612cf6f3ac6a24dd05f322a25c6ba5808dbaad8;ds=sidebyside

move more code to onCreate
---

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):