aboutsummaryrefslogtreecommitdiff
path: root/lib/gui/elistboxcontent.cpp
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-11-11 10:24:49 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-11-11 10:24:49 +0100
commit33ea51a6202ec4f1414b631cf7c9a301ecea9938 (patch)
tree16280208c5ba2bc378d2de5cd02815625554cee0 /lib/gui/elistboxcontent.cpp
parenta7175f3218cbb81c7c1cd07a8092e5a2b30dac44 (diff)
parent29788aa82abe81b63571066daff593db95695423 (diff)
downloadenigma2-33ea51a6202ec4f1414b631cf7c9a301ecea9938.tar.gz
enigma2-33ea51a6202ec4f1414b631cf7c9a301ecea9938.zip
Merge branch 'bug_539_add_multicontent_pixmap_progress'
Diffstat (limited to 'lib/gui/elistboxcontent.cpp')
-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");