X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8a53a2ad8943629f8ec86c9144c11132d1d8256d..e131b75fd194db84a37f2395b5ab88093e09192f:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 90e86225..df1bd6c0 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -128,7 +128,7 @@ class ChannelContextMenu(Screen):
 
 	def bouquetInputCallback(self, bouquet):
 		if bouquet is not None:
-			self.csel.addBouquet(bouquet, True)
+			self.csel.addBouquet(bouquet, None, True)
 
 	def addServiceToBouquetSelected(self):
 		bouquets = self.csel.getBouquetList()
@@ -836,17 +836,17 @@ class ChannelSelectionBase(Screen):
 
 HISTORYSIZE = 20
 
+#config for lastservice
+config.tv = ConfigSubsection();
+config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
+config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0);
+
 class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG):
 	def __init__(self, session):
 		ChannelSelectionBase.__init__(self,session)
 		ChannelSelectionEdit.__init__(self)
 		ChannelSelectionEPG.__init__(self)
 
-		#config for lastservice
-		config.tv = ConfigSubsection();
-		config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
-		config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0);
-
 		self["actions"] = ActionMap(["OkCancelActions"],
 			{
 				"cancel": self.cancel,
@@ -895,9 +895,9 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		nref = self.getCurrentSelection()
 		if ref is None or ref != nref:
 			self.session.nav.playService(nref)
-		self.saveRoot()
-		self.saveChannel()
-		self.addToHistory(nref)
+			self.saveRoot()
+			self.saveChannel()
+			self.addToHistory(nref)
 
 	def addToHistory(self, ref):
 		if self.servicePath is not None: