X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScanSetup.py;h=fa787a7043500f63583d329b159e90039557fb04;hb=ae12f5e4894a65289aeafd97931e1651939bf8b1;hp=d0af8f7ecadf90ac05a19a20f304c02c453432b3;hpb=513239a74d5abdc0c22fdd8d4dcb892703ef8c27;p=vuplus_dvbapp

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index d0af8f7..fa787a7 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -295,9 +295,11 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 
 		self.list = []
 		ConfigListScreen.__init__(self, self.list)
-		self.createSetup()
-
-		self["introduction"] = Label(_("Press OK to start the scan"))
+		if not self.scan_nims.value == "":
+			self.createSetup()
+			self["introduction"] = Label(_("Press OK to start the scan"))
+		else:
+			self["introduction"] = Label(_("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."))
 
 	def runAsync(self, finished_cb):
 		self.finished_cb = finished_cb
@@ -522,6 +524,8 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 			for n in nimmanager.nim_slots:
 				if n.config_mode == "nothing":
 					continue
+				if n.config_mode == "advanced" and len(nimmanager.getSatListForNim(n.slot)) < 1:
+					continue
 				if n.config_mode in ("loopthrough", "satposdepends"):
 					root_id = nimmanager.sec.getRoot(n.slot_id, int(n.config.connectedTo.value))
 					if n.type == nimmanager.nim_slots[root_id].type: # check if connected from a DVB-S to DVB-S2 Nim or vice versa
@@ -709,6 +713,8 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		tlist.append(buildTerTransponder(*args, **kwargs))
 
 	def keyGo(self):
+		if self.scan_nims.value == "":
+			return
 		tlist = []
 		flags = None
 		startScan = True