set stored lastroot

1 files changed, 16 insertions, 2 deletions

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 415b1000..8714dd63 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -332,8 +332,16 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 		#if config.tv.lastroot.value == "":
 		#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'))
-		self.showFavourites()
-		self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
+
+		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):
@@ -365,6 +373,12 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 			})
 		self["actions"].csel = self
 		self.onShown.append(self.onShow)
+		self.onLayoutFinish.append(self.onCreate)
+
+	def onCreate(self):
+		lastservice=eServiceReference(config.tv.lastservice.value)
+		if lastservice.valid():
+			self.servicelist.setCurrent(lastservice)
 
 	def onShow(self):
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()