aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-09-09 16:25:54 +0200
committerUlf Hermann <ulf.hermann@digia.com>2014-09-10 13:58:23 +0200
commitc5d9dc9367c3d3acf5fdf473c3288c8ccf2f2ef5 (patch)
treefc029b97aaba9158d490990bcf56d5f5f522d968
parent8996d9a701d0391b9031962a07ced5e36ccc0316 (diff)
Don't post deleteLater on invalid canvas contexts
QCoreApplication complains about that. The context will only be valid once it has been requested in one way or another. Change-Id: Idb44f2541d71355443a5b491078a3040907b1614 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index fffd4696a1..f9e7bfd0ae 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -634,7 +634,8 @@ void QQuickCanvasItem::releaseResources()
void QQuickCanvasItem::invalidateSceneGraph()
{
Q_D(QQuickCanvasItem);
- d->context->deleteLater();
+ if (d->context)
+ d->context->deleteLater();
d->context = 0;
d->node = 0; // managed by the scene graph, just reset the pointer
delete d->textureProvider;