diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-04-19 00:12:13 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-04-19 00:12:13 +0000 |
| commit | 5763b994b39952bc06a75e634b4418f13b0aeaf2 (patch) | |
| tree | 17b26666565ddabde45a2867463795f1fd253a7f /lib/python/Screens | |
| parent | 3da80fb995746d6be853bfedf749d6e6c872b5e6 (diff) | |
| download | enigma2-5763b994b39952bc06a75e634b4418f13b0aeaf2.tar.gz enigma2-5763b994b39952bc06a75e634b4418f13b0aeaf2.zip | |
fix bluescreen when wizard ends
dont ask to scan 2nd NIM when both nims have the same satellites configured
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 8 | ||||
| -rw-r--r-- | lib/python/Screens/Wizard.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index b2a53ab0..2dbbca27 100644 --- 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 ca518192..fc76bcd2 100644 --- 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: |