X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgui%2Felistboxcontent.cpp;h=1dc4f48ce434b760dd6f302c9e46063455190d2b;hp=43fbc5945bd3b96081591dbfb29d3e874dfcc718;hb=322f606a88150a635adf7b42da6a96667aed0058;hpb=dd2f75a38c17459f1a3d46cf529a6b4fe3f7e3f2

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 43fbc59..1dc4f48 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -640,7 +640,8 @@ static ePyObject lookupColor(ePyObject color, ePyObject data)
 	if ((icolor & 0xFF000000) == 0xFF000000)
 	{
 		int index = icolor & 0xFFFFFF;
-		eDebug("[eListboxPythonMultiContent] template color index: %d", index);
+		if (PyTuple_GetItem(data, index) == Py_None)
+			return ePyObject();
 		return PyTuple_GetItem(data, index);
 	}
 
@@ -967,6 +968,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");