X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/62f0db333dd61a779e0545142a4f6d2c7daad52e..ac2878879847f965225e0f72c22ad17b513c16e6:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 40e89420..a5712dcd 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -373,7 +373,6 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 		new_configured_sats = nimmanager.getConfiguredSats()
 		self.unconfed_sats = old_configured_sats - new_configured_sats
 		self.satpos_to_remove = None
-		self.restoreService(_("Zap back to service before tuner setup?"))
 		self.deleteConfirmed((None, "no"))
 
 	def deleteConfirmed(self, confirmed):
@@ -403,7 +402,9 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 			if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
 				self.deleteConfirmed(confirmed)
 			break
-		
+		else:
+			self.restoreService(_("Zap back to service before tuner setup?"))
+
 	def __init__(self, session, slotid):
 		Screen.__init__(self, session)
 		self.list = [ ]
@@ -488,7 +489,7 @@ class NimSelection(Screen):
 	def okbuttonClick(self):
 		nim = self["nimlist"].getCurrent()
 		nim = nim and nim[3]
-		if nim is not None and not nim.empty:
+		if nim is not None and not nim.empty and nim.isSupported():
 			self.session.openWithCallback(self.updateList, self.resultclass, nim.slot)
 			
 	def showNim(self, nim):
@@ -547,6 +548,8 @@ class NimSelection(Screen):
 						text = _("enabled")
 				if x.isMultiType():
 					text = _("Switchable tuner types:") + "(" + ','.join(x.getMultiTypeList().values()) + ")" + "\n" + text
+				if not x.isSupported():
+					text = _("tuner is not supported")
 					
 				self.list.append((slotid, x.friendly_full_description, text, x))
 		self["nimlist"].setList(self.list)