diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-10-01 16:38:16 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-10-01 16:38:16 (GMT) |
| commit | b828964113b157d36f8140c7a6fa649676af026a (patch) | |
| tree | fb1e7f882f460039b2f3c3a5656a59328426f38b /src/opengl/qgl.cpp | |
| parent | 1596c59964f26a44a80bd5b41d519b497cdc6292 (diff) | |
| parent | 25f82aa1650c018a4dccde972642310d6ef4febc (diff) | |
| download | Qt-b828964113b157d36f8140c7a6fa649676af026a.zip Qt-b828964113b157d36f8140c7a6fa649676af026a.tar.gz Qt-b828964113b157d36f8140c7a6fa649676af026a.tar.bz2 | |
Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 0ad6772..1276443 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1624,9 +1624,8 @@ void QGLTextureCache::pixmapCleanupHook(QPixmap* pixmap) } #if defined(Q_WS_X11) QPixmapData *pd = pixmap->data_ptr().data(); - // Only need to delete the gl surface if the pixmap is about to be deleted - if (pd->ref == 0) - QGLContextPrivate::destroyGlSurfaceForPixmap(pd); + Q_ASSERT(pd->ref == 1); // Make sure reference counting isn't broken + QGLContextPrivate::destroyGlSurfaceForPixmap(pd); #endif } |