From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 12 Nov 2010 18:56:05 +0000 (+0100)
Subject: Merge branch 'master' into m2ts_test
X-Git-Tag: exp-2010.12~4^2~11
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/27ed4642b10f57a6c0c7c776d8e6bb9cfa2d4287?hp=7b5579c5aac63a59dedb20067562ff097da5b1f3

Merge branch 'master' into m2ts_test
---

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");