From: Felix Domke Date: Thu, 29 Sep 2005 16:44:41 +0000 (+0000) Subject: eListboxPythonConfigContent: handle AnwenderFehler more gracefully X-Git-Tag: 2.6.0~5554 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/3d5abd63531d388ad02bfb454decadad18b32fb0?ds=sidebyside eListboxPythonConfigContent: handle AnwenderFehler more gracefully --- diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index f804ee0e..f94765ef 100644 --- 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); + + if (PyErr_Occurred()) + PyErr_Print(); 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); @@ -513,7 +516,8 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, } } Py_XDECREF(type); - } + } else + eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple."); /* value is borrowed */ }