From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 3 Jul 2009 10:35:05 +0000 (+0200)
Subject: allow to do a manual scan on linked tuners when the type of linked and directly conne... 
X-Git-Tag: 2.6.0~221
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/dbe0c802ce377fe052622522be8e3971e579ba9b

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)
---

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)