aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-11-11 13:53:42 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-11-11 13:53:42 +0100
commit4b1e99839f61efa61eb194467f8ef1acd3a5e32c (patch)
tree16280208c5ba2bc378d2de5cd02815625554cee0 /lib
parentc4e5a7dc0720e316df37f2ad9f0f1fce3873a52e (diff)
parent33ea51a6202ec4f1414b631cf7c9a301ecea9938 (diff)
downloadenigma2-3.0.0.tar.gz
enigma2-3.0.0.zip
Merge branch 'master' into 3.03.0.0
Diffstat (limited to 'lib')
-rw-r--r--lib/gui/elistboxcontent.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 43fbc594..97e2cc67 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -967,6 +967,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
if (ppixmap)
{
ePtr<gPixmap> pixmap;
+ if (PyInt_Check(ppixmap) && data) /* if the pixmap is in fact a number, it refers to the data list */
+ ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap));
+
if (SwigFromPython(pixmap, ppixmap))
{
eDebug("eListboxPythonMultiContent (Pixmap) get pixmap failed");