fix bluescreen when wizard ends

dont ask to scan 2nd NIM when both nims have the same satellites configured

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index b2a53ab..2dbbca2 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -542,9 +542,13 @@ class ScanSimple(Screen):
                        sec = eDVBSatelliteEquipmentControl.getInstance()
                        if sec is not None:
                                exclusive_satellites = sec.get_exclusive_satellites(0,1)
-                               if len(exclusive_satellites) == 0:
+                               if len(exclusive_satellites) == 2:
                                        return False
-                       return True
+                               idx = exclusive_satellites[0]+1
+                               exclusive_nim_sats = exclusive_satellites[idx+1:idx+1+exclusive_satellites[idx]]
+                               if len(exclusive_nim_sats):
+                                       return True
+               return False # two -C or two -T tuners
 
        def __init__(self, session):
                Screen.__init__(self, session)

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index ca51819..fc76bcd 100644 (file)
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -166,7 +166,7 @@ class Wizard(Screen, HelpableScreen):
 
                if (currStep == self.numSteps): # wizard finished
                        self.markDone()
-                       self.session.close()
+                       self.close()
                else:
                        self.runCode(self.wizard[currStep]["codeafter"])
                        if self.wizard[currStep]["nextstep"] is not None: