X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/82c3d190f3e20cb8d2473be89c1fb1ed5d98cec3..454fc2dd8591aa9f45545f9c0c667a49a221b285:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 7dd805cb..b2d06a4f 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -342,7 +342,10 @@ class ChannelSelectionEdit:
 		self.mutableList = None
 		self.setTitle(self.saved_title)
 		self.saved_title = None
-		self.servicePath = self.savedPath[:]
+		# self.servicePath is just a reference to servicePathTv or Radio...
+		# so we never ever do use the asignment operator in self.servicePath
+		del self.servicePath[:] # remove all elements
+		self.servicePath += self.savedPath # add saved elements
 		del self.savedPath
 		self.setRoot(self.servicePath[len(self.servicePath)-1])
 
@@ -371,7 +374,6 @@ class ChannelSelectionEdit:
 			if not mutableList.addService(self.servicelist.getCurrent()):
 				self.bouquetNumOffsetCache = { }
 				mutableList.flushChanges()
-		self.close()
 
 	def toggleMoveMode(self):
 		if self.movemode:
@@ -436,7 +438,9 @@ class ChannelSelectionBase(Screen):
 
 		self.servicePathTV = [ ]
 		self.servicePathRadio = [ ]
-		self.servicePath = None
+		self.servicePath = [ ]
+
+		self.mode = MODE_TV
 
 		self.pathChangedDisabled = False
 
@@ -459,7 +463,7 @@ class ChannelSelectionBase(Screen):
 				"7": self.keyNumberGlobal,
 				"8": self.keyNumberGlobal,
 				"9": self.keyNumberGlobal,
-				"0": self.keyNumberGlobal
+				"0": self.keyNumber0
 			})
 
 	def appendDVBTypes(self, ref):
@@ -784,6 +788,27 @@ class ChannelSelectionBase(Screen):
 			return bouquets
 		return None
 
+	def keyNumber0(self, num):
+		if len(self.servicePath) > 1:
+			self.keyGoUp()
+		else:
+			self.keyNumberGlobal(num)
+
+	def keyGoUp(self):
+		if len(self.servicePath) > 1:
+			if self.isBasePathEqual(self.bouquet_root):
+				self.showFavourites()
+			else:
+				ref = eServiceReference('%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types))
+				if self.isBasePathEqual(ref):
+					self.showSatellites()
+				else:
+					ref = eServiceReference('%s FROM PROVIDERS ORDER BY name'%(self.service_types))
+					if self.isBasePathEqual(ref):
+						self.showProviders()
+					else:
+						self.showAllServices()
+
 HISTORYSIZE = 20
 
 class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG):
@@ -847,18 +872,19 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 			self.session.nav.playService(nref)
 		self.saveRoot()
 		self.saveChannel()
-		tmp=self.servicePath[:]
-		tmp.append(nref)
-		try:
-			del self.history[self.history_pos+1:]
-		except:
-			pass
-		self.history.append(tmp)
-		hlen = len(self.history)
-		if hlen > HISTORYSIZE:
-			del self.history[0]
-			hlen -= 1
-		self.history_pos = hlen-1
+		if self.servicePath is not None:
+			tmp=self.servicePath[:]
+			tmp.append(nref)
+			try:
+				del self.history[self.history_pos+1:]
+			except:
+				pass
+			self.history.append(tmp)
+			hlen = len(self.history)
+			if hlen > HISTORYSIZE:
+				del self.history[0]
+				hlen -= 1
+			self.history_pos = hlen-1
 
 	def historyBack(self):
 		hlen = len(self.history)
@@ -875,7 +901,8 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 	def setHistoryPath(self):
 		path = self.history[self.history_pos][:]
 		ref = path.pop()
-		self.servicePath = path
+		del self.servicePath[:]
+		self.servicePath += path
 		self.saveRoot()
 		plen = len(path)
 		root = path[plen-1]