From: ghost Date: Tue, 30 Jun 2009 07:34:05 +0000 (+0200) Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2 X-Git-Tag: 2.6.0~226 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/9b8c07c78ce40cbaed2f9cb7e35d23a2502d4638?hp=0c2e529601f9931dc808388dfb8ec0a5fb96f06f Merge branch 'master' of git.opendreambox.org:/git/enigma2 --- diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index c5b2f8db..c278213c 100644 --- 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)