aboutsummaryrefslogtreecommitdiff
path: root/lib/gui/elistboxcontent.cpp
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-11-11 10:24:56 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-11-11 10:24:56 +0100
commit905ec92277bf423670ddf0c24a26c2b31483e9c7 (patch)
tree28a743c331c155bb3b5bb0cc15425101d4021bb1 /lib/gui/elistboxcontent.cpp
parent272f74ec51c329c905d9a7ee13e3f36793867eb2 (diff)
parent29788aa82abe81b63571066daff593db95695423 (diff)
downloadenigma2-905ec92277bf423670ddf0c24a26c2b31483e9c7.tar.gz
enigma2-905ec92277bf423670ddf0c24a26c2b31483e9c7.zip
Merge branch 'bug_539_add_multicontent_pixmap_progress' into experimental
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");