aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens/ScanSetup.py
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-12-03 17:56:03 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-12-03 17:56:03 +0100
commit0cb206d2c07cb9e4130e13234e3fd59b127421a8 (patch)
tree07bcbcc638a6012d32b0574531cf0bd8304484ae /lib/python/Screens/ScanSetup.py
parent99a717e9813eab30cd34f5da6f4a5ab6e791dc1f (diff)
parente9272c492c7a3c7fd8a1225a4baa6bee2a02eea8 (diff)
downloadenigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.tar.gz
enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.zip
Merge branch 'master' into bug_245_record_playback_fixes
Diffstat (limited to 'lib/python/Screens/ScanSetup.py')
-rw-r--r--lib/python/Screens/ScanSetup.py10
1 files changed, 7 insertions, 3 deletions
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