From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Wed, 21 Dec 2005 08:44:31 +0000 (+0000)
Subject: zap to last channel with 0
X-Git-Tag: 2.6.0~4632
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/7b46919af63cfcb6adbe72d8d4183a203dfcfce7

zap to last channel with 0
(could someone check, if this has no side effects now? the root isn't set right after 0-zap... please fix... i have no idea how this can be done)
---

diff --git a/Navigation.py b/Navigation.py
index 751aca89..d8a98b12 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -21,6 +21,7 @@ class Navigation:
 		self.event = [ ]
 		self.currentlyPlayingService = None
 		self.currentlyPlayingServiceReference = None
+		self.lastServiceRef = None
 		
 		self.RecordTimer = RecordTimer.RecordTimer()
 
@@ -29,6 +30,7 @@ class Navigation:
 			x(i)
 	
 	def playService(self, ref):
+		self.lastServiceRef = self.currentlyPlayingServiceReference
 		self.currentlyPlayingServiceReference = None
 		if ref is None:
 			self.stopService()
@@ -39,6 +41,9 @@ class Navigation:
 			return 0
 		return 1
 	
+	def zapLast(self):
+		return self.playService(self.lastServiceRef)
+	
 	def getCurrentlyPlayingServiceReference(self):
 		return self.currentlyPlayingServiceReference
 	
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 67781633..85e2794f 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -254,7 +254,12 @@ class InfoBarNumberZap:
 
 	def keyNumberGlobal(self, number):
 #		print "You pressed number " + str(number)
-		self.session.openWithCallback(self.numberEntered, NumberZap, number)
+		if number == 0:
+			self.session.nav.zapLast()
+			self.instance.show()
+			self.show()
+		else:
+			self.session.openWithCallback(self.numberEntered, NumberZap, number)
 
 	def numberEntered(self, retval):
 #		print self.servicelist