X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a15fb97d2595fd6dedca2f97ca8b875cd789e730..cab018779de4f2f01e0fe651e71112754ebd0ef8:/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 90de8b2f..a4008c2d 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -125,15 +125,20 @@ class PositionerSetup(Screen):
 		self.statusTimer = eTimer()
 		self.statusTimer.callback.append(self.updateStatus)
 		self.statusTimer.start(50, False)
+		self.onClose.append(self.__onClose)
+
+	def __onClose(self):
+		self.session.nav.playService(self.oldref)
 
 	def restartPrevService(self, yesno):
 		if yesno:
 			if self.frontend:
 				self.frontend = None
 				del self.raw_channel
-			self.session.nav.playService(self.oldref)
-		self.close(None)
-	
+		else:
+			self.oldref=None
+		self.close(None)	
+
 	def keyCancel(self):
 		if self.oldref:
 			self.session.openWithCallback(self.restartPrevService, MessageBox, _("Zap back to service before positioner setup?"), MessageBox.TYPE_YESNO)
@@ -530,7 +535,7 @@ class TunerScreen(ScanSetup):
 	def keyCancel(self):
 		self.close(None)
 
-class NimSelection(Screen):
+class RotorNimSelection(Screen):
 	skin = """
 		<screen position="140,165" size="400,100" title="select Slot">
 			<widget name="nimlist" position="20,10" size="360,75" />
@@ -572,7 +577,7 @@ def PositionerMain(session, **kwargs):
 			if len(usableNims) == 1:
 				session.open(PositionerSetup, usableNims[0])
 			elif len(usableNims) > 1:
-				session.open(NimSelection)
+				session.open(RotorNimSelection)
 			else:
 				session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)