summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-11-05 15:25:31 +0200
committerAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-11-05 15:25:31 +0200
commita7b8ca44b213a92cc8638a78d1f1f15c209ca6ef (patch)
treed78886a00754bb3e7ecab9687c6cdbc84112aa4b
parent5f457d8b60cd778065af1a6321760cdb4d895156 (diff)
Fixes: http://bugs.meego.com/show_bug.cgi?id=8957
Changes: On the GLX backend, ensure that the window's pixmap is not null before rebinding it. RevBy: TrustMe
-rw-r--r--src/mtexturepixmapitem_glx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mtexturepixmapitem_glx.cpp b/src/mtexturepixmapitem_glx.cpp
index c2551a5..0f0058c 100644
--- a/src/mtexturepixmapitem_glx.cpp
+++ b/src/mtexturepixmapitem_glx.cpp
@@ -183,7 +183,7 @@ void MTexturePixmapItem::rebindPixmap()
None
};
- if (!d->custom_tfp) {
+ if (!d->custom_tfp && d->windowp) {
Display *display = QX11Info::display();
glXReleaseTexImageEXT(display, d->glpixmap, GLX_FRONT_LEFT_EXT);
glXDestroyPixmap(display, d->glpixmap);