From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sat, 7 Nov 2009 11:43:22 +0000 (+0100)
Subject: fixes bug #283
X-Git-Tag: 2.6.1~19
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/ae74d5cc79dc30b8b496b2645b836e0dd9c98267?hp=-c

fixes bug #283
if nothing is connected to any nim, don't die entering scan setup
---

ae74d5cc79dc30b8b496b2645b836e0dd9c98267
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 72dc3577..16504abf 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -803,9 +803,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="config" position="10,165" size="500,225" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Scan setup -->
-	<screen name="ScanSetup" position="center,center" size="520,390" title="Service scan">
+	<screen name="ScanSetup" position="center,center" size="520,450" title="Service scan">
 		<widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
-		<widget name="introduction" position="10,365" size="500,25" font="Regular;20" halign="center" />
+		<widget name="introduction" position="10,365" size="500,75" font="Regular;20" halign="center" />
 	</screen>
 	<!-- Scan simple -->
 	<screen name="ScanSimple" position="center,center" size="420,350" title="Service scan">
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index d0af8f7e..bea08724 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
@@ -709,6 +711,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