Don't crash when QSGCanvas::sceneGraphContext() is called prematurly
authorGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 28 Jun 2011 06:00:39 +0000 (08:00 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 28 Jun 2011 06:06:33 +0000 (08:06 +0200)
Change-Id: Ib15814bbc095c1be87a8fcddb574444d5258afbb
Reviewed-on: http://codereview.qt.nokia.com/813
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

src/declarative/items/qsgcanvas.cpp

index 97d643d..3abbec3 100644 (file)
@@ -1973,7 +1973,7 @@ void QSGCanvas::maybeUpdate()
 QSGEngine *QSGCanvas::sceneGraphEngine() const
 {
     Q_D(const QSGCanvas);
-    if (d->context->isReady())
+    if (d->context && d->context->isReady())
         return d->context->engine();
     return 0;
 }