From 1d8ce23abdb0bd980292e4a9c8d87c019585150a Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 6 Aug 2010 13:42:43 +0200
Subject: Add missing null check to lighthouse's QGLTemporaryContext.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Jørgen Lind
---
 src/opengl/qgl_qpa.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index ad125fe..d87e668 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;
 }
 
-- 
cgit v0.12