allow to do a manual scan on linked tuners when the type of linked and directly conne...
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 3 Jul 2009 10:35:05 +0000 (12:35 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 3 Jul 2009 10:35:05 +0000 (12:35 +0200)
lib/python/Screens/ScanSetup.py

index 7089074ad0026cf42f379630c8fce5fb1f9cc062..2e48a969981da7a16424163ec5ab4b555a4c219a 100644 (file)
@@ -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)