diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-10-06 09:00:42 +0200 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-10-06 09:00:42 +0200 |
| commit | 0edde94c71828b4cbb95bbfb7011b6b966562742 (patch) | |
| tree | 6db16a96def5c5d0ebc2d916dba5030c4e49fe0e /lib/python/Screens | |
| parent | 0ffddc5916909206895777778b1ac99073ae1ca2 (diff) | |
| parent | 006e3497641164df7a413c8730d9b8914d67e2d8 (diff) | |
| download | enigma2-0edde94c71828b4cbb95bbfb7011b6b966562742.tar.gz enigma2-0edde94c71828b4cbb95bbfb7011b6b966562742.zip | |
Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management' into bug_593_i2c_device_from_file
Conflicts:
lib/python/Components/NimManager.py
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/Satconfig.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 44f4251a..a5712dcd 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -489,7 +489,7 @@ class NimSelection(Screen): def okbuttonClick(self): nim = self["nimlist"].getCurrent() nim = nim and nim[3] - if nim is not None and not nim.empty: + if nim is not None and not nim.empty and nim.isSupported(): self.session.openWithCallback(self.updateList, self.resultclass, nim.slot) def showNim(self, nim): @@ -548,6 +548,8 @@ class NimSelection(Screen): text = _("enabled") if x.isMultiType(): text = _("Switchable tuner types:") + "(" + ','.join(x.getMultiTypeList().values()) + ")" + "\n" + text + if not x.isSupported(): + text = _("tuner is not supported") self.list.append((slotid, x.friendly_full_description, text, x)) self["nimlist"].setList(self.list) |