projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
af7b17d
)
lib/gui/elistboxcontent.cpp: dont crash on non selectable entries
author
ghost
<andreas.monzner@multimedia-labs.de>
Fri, 4 Jun 2010 12:50:01 +0000
(14:50 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Fri, 4 Jun 2010 12:53:04 +0000
(14:53 +0200)
lib/gui/elistboxcontent.cpp
patch
|
blob
|
history
diff --git
a/lib/gui/elistboxcontent.cpp
b/lib/gui/elistboxcontent.cpp
index
a65df2e
..
1d0323c
100644
(file)
--- a/
lib/gui/elistboxcontent.cpp
+++ b/
lib/gui/elistboxcontent.cpp
@@
-343,7
+343,6
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
if (PyTuple_Check(item))
{
/* handle left part. get item from tuple, convert to string, display. */
if (PyTuple_Check(item))
{
/* handle left part. get item from tuple, convert to string, display. */
-
text = PyTuple_GET_ITEM(item, 0);
text = PyObject_Str(text); /* creates a new object - old object was borrowed! */
const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : "<not-a-string>";
text = PyTuple_GET_ITEM(item, 0);
text = PyObject_Str(text); /* creates a new object - old object was borrowed! */
const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : "<not-a-string>";
@@
-357,7
+356,9
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
int value_alignment_left = !*string;
/* now, handle the value. get 2nd part from tuple*/
int value_alignment_left = !*string;
/* now, handle the value. get 2nd part from tuple*/
- value = PyTuple_GET_ITEM(item, 1);
+ if (PyTuple_Size(item) >= 2) // when no 2nd entry is in tuple this is a non selectable entry without config part
+ value = PyTuple_GET_ITEM(item, 1);
+
if (value)
{
ePyObject args = PyTuple_New(1);
if (value)
{
ePyObject args = PyTuple_New(1);
@@
-468,7
+469,7
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
}
}
/* type is borrowed */
}
}
/* type is borrowed */
- } else
+ } else
if (value)
eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple.");
if (value)
Py_DECREF(value);
eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple.");
if (value)
Py_DECREF(value);