From c5d9dc9367c3d3acf5fdf473c3288c8ccf2f2ef5 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Tue, 9 Sep 2014 16:25:54 +0200
Subject: [PATCH] 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>
---
src/quick/items/context2d/qquickcanvasitem.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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;
--
GitLab