summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-05-31 14:49:24 +0300
committerAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-05-31 14:49:24 +0300
commit3bbabcf124c9d8b459ca3cb7ca4145536ee00b6f (patch)
tree8685f40276e83df1491f2984fe44503e8be3e6b9
parent610a4d41c00bd65aac15fbf87e48e35aac94bab2 (diff)
Changes: Fix compile error on GLX version + updated library version0.4.6rc1
RevBy: TrustMe
-rw-r--r--src/mtexturepixmapitem_glx.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mtexturepixmapitem_glx.cpp b/src/mtexturepixmapitem_glx.cpp
index 2d8b549..715487e 100644
--- a/src/mtexturepixmapitem_glx.cpp
+++ b/src/mtexturepixmapitem_glx.cpp
@@ -84,10 +84,13 @@ static bool hasTextureFromPixmap()
void MTexturePixmapItem::init()
{
- if (attrs->map_state != IsViewable) {
- qWarning("MTexturePixmapItem::init(): Failed getting offscreen pixmap");
+ if (isValid() && (windowAttributes()->map_state != IsViewable)) {
+ qWarning("MTexturePixmapItem::%s(): Failed getting offscreen pixmap",
+ __func__);
+ d->setValid(false);
+ return;
+ } else if (!isValid())
return;
- }
d->glpixmap = 0;
saveBackingStore();