git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/bug_590'
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 471b59ec55f5c21396461638ad41db74abe2b02a..1afd398ea1b6d5ed42202097f15a9806c87dbc8e 100755
(executable)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-178,7
+178,7
@@
class choicesList(object): # XXX: we might want a better name for this
def __list__(self):
if self.type == choicesList.LIST_TYPE_LIST:
def __list__(self):
if self.type == choicesList.LIST_TYPE_LIST:
- ret = [not isinstance(x, tuple) and x or
x[0]
for x in self.choices]
+ ret = [not isinstance(x, tuple) and x or
len(x) > 0 and x[0] or len(x) == 0 and x
for x in self.choices]
else:
ret = self.choices.keys()
return ret or [""]
else:
ret = self.choices.keys()
return ret or [""]