diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-29 11:02:23 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-29 11:02:23 (GMT) |
| commit | 14fbf743d618e326277e4a314470804d122276e3 (patch) | |
| tree | 5374ded836204edffce024bd3890d7824b3e5781 /src/opengl/qgl_p.h | |
| parent | 2fd00b200e5e1b13effdf8773386230891127dbe (diff) | |
| parent | a4f9efdae9b11d11c8e28ac3884365f2e7792085 (diff) | |
| download | Qt-14fbf743d618e326277e4a314470804d122276e3.zip Qt-14fbf743d618e326277e4a314470804d122276e3.tar.gz Qt-14fbf743d618e326277e4a314470804d122276e3.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index a603ae6..a32a311 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -520,7 +520,8 @@ private slots: // when you come to delete the context. QGLContextPrivate::unbindPixmapFromTexture(boundPixmap); glDeleteTextures(1, &id); - oldContext->makeCurrent(); + if (oldContext) + oldContext->makeCurrent(); return; } #endif |