NimManager.py: fix not working "Tuner Equal to" option in complex tuner configurations

[vuplus_dvbapp] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 6222afe..c278213 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -46,7 +46,7 @@ class SecConfigure:
                if self.equal.has_key(slotid):
                        for slot in self.equal[slotid]:
                                tunermask |= (1 << slot)
-               elif self.linked.has_key(slotid):
+               if self.linked.has_key(slotid):
                        for slot in self.linked[slotid]:
                                tunermask |= (1 << slot)
                sec.setLNBSatCR(-1)
@@ -262,7 +262,7 @@ class SecConfigure:
                                if self.equal.has_key(slotid):
                                        for slot in self.equal[slotid]:
                                                tunermask |= (1 << slot)
-                               elif self.linked.has_key(slotid):
+                               if self.linked.has_key(slotid):
                                        for slot in self.linked[slotid]:
                                                tunermask |= (1 << slot)
 
@@ -321,9 +321,9 @@ class SecConfigure:
                                elif dm == "1_2":
                                        sec.setDiSEqCMode(diseqcParam.V1_2)
 
-                               if self.satposdepends.has_key(slotid):
-                                       for slot in self.satposdepends[slotid]:
-                                               tunermask |= (1 << slot)
+                                       if self.satposdepends.has_key(slotid):
+                                               for slot in self.satposdepends[slotid]:
+                                                       tunermask |= (1 << slot)
 
                                if dm != "none":
                                        if currLnb.toneburst.value == "none":
@@ -856,7 +856,7 @@ def InitSecParams():
        config.sec.delay_after_last_diseqc_command = x
 
        x = ConfigInteger(default=50, limits = (0, 9999))
-       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value), initial_call = False)
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value))
        config.sec.delay_after_toneburst = x
 
        x = ConfigInteger(default=20, limits = (0, 9999))