summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_qpa.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2010-08-06 13:42:43 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2010-08-06 13:42:43 +0200
commit1d8ce23abdb0bd980292e4a9c8d87c019585150a (patch)
tree50fc0ff4deac9026e757ddfe27e4a83650eed4f5 /src/opengl/qgl_qpa.cpp
parent783f218aac7c73837405af4893d8dd35b425a710 (diff)
Add missing null check to lighthouse's QGLTemporaryContext.
Reviewed-by: Jørgen Lind
Diffstat (limited to 'src/opengl/qgl_qpa.cpp')
-rw-r--r--src/opengl/qgl_qpa.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index ad125fec1d..d87e668e1f 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -252,7 +252,8 @@ QGLTemporaryContext::QGLTemporaryContext(bool, QWidget *)
: d(new QGLTemporaryContextPrivate)
{
d->context = const_cast<QGLContext *>(QGLContext::currentContext());
- d->context->doneCurrent();
+ if (d->context)
+ d->context->doneCurrent();
d->widget = new QGLWidget;
d->widget->makeCurrent();
}
@@ -260,7 +261,8 @@ QGLTemporaryContext::QGLTemporaryContext(bool, QWidget *)
QGLTemporaryContext::~QGLTemporaryContext()
{
d->widget->doneCurrent();
- d->context->makeCurrent();
+ if (d->context)
+ d->context->makeCurrent();
delete d->widget;
}