From fe79a39da47fd1ef36ade6ac8ad1b6f794c39d48 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Sat, 7 Nov 2009 12:43:22 +0100 Subject: fixes bug #283 if nothing is connected to any nim, don't die entering scan setup --- lib/python/Screens/ScanSetup.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/python') 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 -- cgit v1.2.3 From 20c942082eedd5307bd331e4097b9892adaed120 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Sun, 15 Nov 2009 11:50:25 +0100 Subject: fixes bug #286 remove DVI-PC from video wizard to solve some sorting problems and remove a not widely used option remove --- lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/python') diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py index 3759c21a..cd1529aa 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py @@ -84,7 +84,8 @@ class VideoWizard(WizardLanguage, Rc): descr = port if descr == 'DVI' and hw_type == 'dm500hd': descr = 'HDMI' - list.append((descr,port)) + if port != "DVI-PC": + list.append((descr,port)) list.sort(key = lambda x: x[0]) print "listInputChannels:", list return list -- cgit v1.2.3