X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FSatconfig.py;h=749c09db1a2df245e20247e9e9b45004c22aedde;hp=f455e3c049712034cd0a8a3d730940c7608e8287;hb=3f34006c270bc0b6de4d65edf7d46ae54c87774c;hpb=63473fb658a8a70a67d4c68eba2deb7850739f2e

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index f455e3c..749c09d 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -76,6 +76,7 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 		print "Creating setup"
 		self.list = [ ]
 
+		self.multiType = None
 		self.configMode = None
 		self.diseqcModeEntry = None
 		self.advancedSatsEntry = None
@@ -207,13 +208,11 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 			self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, \
 			self.uncommittedDiseqcCommand, self.cableScanType, self.multiType)
 		if self["config"].getCurrent() == self.multiType:
-			print "enumerating:"
-			nimmanager.enumerateNIMs()
-			print "mode value:", self.multiType[1].value
 			from Components.NimManager import InitNimManager
 			InitNimManager(nimmanager)
 			self.nim = nimmanager.nim_slots[self.slotid]
 			self.nimConfig = self.nim.config
+			
 		for x in checkList:
 			if self["config"].getCurrent() == x:
 				self.createSetup()
@@ -361,7 +360,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):
@@ -391,7 +389,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 = [ ]