git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync
[enigma2.git]
/
lib
/
gui
/
elistboxcontent.cpp
diff --git
a/lib/gui/elistboxcontent.cpp
b/lib/gui/elistboxcontent.cpp
index f804ee0e399b1a695ed9d84503396d69ad15f60d..f94765ef6592c43bccef852f0d6648c6ab763bb4 100644
(file)
--- a/
lib/gui/elistboxcontent.cpp
+++ b/
lib/gui/elistboxcontent.cpp
@@
-428,13
+428,16
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
/* CallObject will call __call__ which should return the value tuple */
value = PyObject_CallObject(value, args);
/* CallObject will call __call__ which should return the value tuple */
value = PyObject_CallObject(value, args);
+
+ if (PyErr_Occurred())
+ PyErr_Print();
Py_DECREF(args);
/* the PyInt was stolen. */
}
/* check if this is really a tuple */
Py_DECREF(args);
/* the PyInt was stolen. */
}
/* check if this is really a tuple */
- if (PyTuple_Check(value))
+ if (
value &&
PyTuple_Check(value))
{
/* convert type to string */
PyObject *type = PyTuple_GetItem(value, 0);
{
/* convert type to string */
PyObject *type = PyTuple_GetItem(value, 0);
@@
-513,7
+516,8
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
}
}
Py_XDECREF(type);
}
}
Py_XDECREF(type);
- }
+ } else
+ eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple.");
/* value is borrowed */
}
/* value is borrowed */
}