aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-10-10 12:50:31 +0200
committerghost <andreas.monzner@multimedia-labs.de>2010-10-10 12:50:31 +0200
commitaed83aaddeb4782046a204d7a6884c3a9bdf47a3 (patch)
tree88af1928dd27d7bbe48f852c9d311c74829b6616 /lib/python/Screens
parent8f9863e47458080339807a1e96c34fed4766cb56 (diff)
parent006e3497641164df7a413c8730d9b8914d67e2d8 (diff)
downloadenigma2-aed83aaddeb4782046a204d7a6884c3a9bdf47a3.tar.gz
enigma2-aed83aaddeb4782046a204d7a6884c3a9bdf47a3.zip
Merge remote branch 'origin/bug_587_new_internally_connectable_and_unsupported_tuner_management' into experimental
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/Satconfig.py4
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)