aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-06-28 08:00:39 +0200
committerQt by Nokia <qt-info@nokia.com>2011-06-28 08:06:33 +0200
commitb2e2b070c499a04a3e2f270df62d5dd061e0c027 (patch)
tree195542daa5dfaae139df2337a76b1a9d64e0c683 /src
parent944143997567e711dc74004bbe3334325656fcab (diff)
Don't crash when QSGCanvas::sceneGraphContext() is called prematurly
Change-Id: Ib15814bbc095c1be87a8fcddb574444d5258afbb Reviewed-on: http://codereview.qt.nokia.com/813 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qsgcanvas.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index 97d643dae6..3abbec323d 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -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;
}