aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-11-12 19:56:05 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-11-12 19:56:05 +0100
commit27ed4642b10f57a6c0c7c776d8e6bb9cfa2d4287 (patch)
tree27a0778d524c66e51ad73c52900b6e208ae92045 /lib
parent7b5579c5aac63a59dedb20067562ff097da5b1f3 (diff)
parent33ea51a6202ec4f1414b631cf7c9a301ecea9938 (diff)
downloadenigma2-27ed4642b10f57a6c0c7c776d8e6bb9cfa2d4287.tar.gz
enigma2-27ed4642b10f57a6c0c7c776d8e6bb9cfa2d4287.zip
Merge branch 'master' into m2ts_test
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");