aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-07-03 12:35:05 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-07-03 12:35:05 +0200
commitdbe0c802ce377fe052622522be8e3971e579ba9b (patch)
tree6134f2ed4f2c483953a8a6e8e6d72ef5da8779a2 /lib/python
parentc7742c80580030fd1e5c297114b0080baa11c655 (diff)
downloadenigma2-dbe0c802ce377fe052622522be8e3971e579ba9b.tar.gz
enigma2-dbe0c802ce377fe052622522be8e3971e579ba9b.zip
allow to do a manual scan on linked tuners when the type of linked and directly connected tuner is not equal (DVB-S linked to DVB-S2 or vice versa)
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/ScanSetup.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 7089074a..2e48a969 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -520,8 +520,13 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
nim_list = []
# collect all nims which are *not* set to "nothing"
for n in nimmanager.nim_slots:
- if not n.config_mode in ("loopthrough", "satposdepends", "nothing"):
- nim_list.append((str(n.slot), n.friendly_full_description))
+ if n.config_mode == "nothing":
+ continue
+ if n.config_mode in ("loopthrough", "satposdepends"):
+ root_id = nimmanager.sec.getRoot(n.slot_id, int(n.config.connectedTo.value))
+ if n.type == nimmanager.nim_slots[root_id].type: # check if connected from a DVB-S to DVB-S2 Nim or vice versa
+ continue
+ nim_list.append((str(n.slot), n.friendly_full_description))
self.scan_nims = ConfigSelection(choices = nim_list)