From 66bb01a6c28309bbcd5ba3827acf22645ca5618f Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Thu, 10 Nov 2016 14:07:01 +0200
Subject: Delay sceneloader delete to avoid random crashes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4618069686327c68ec02db16d37908b99e45799f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
---
 editorlib/src/editorsceneitemmodel.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/editorlib/src/editorsceneitemmodel.cpp b/editorlib/src/editorsceneitemmodel.cpp
index a385070..1a2d029 100644
--- a/editorlib/src/editorsceneitemmodel.cpp
+++ b/editorlib/src/editorsceneitemmodel.cpp
@@ -206,7 +206,8 @@ void EditorSceneItemModel::handleImportEntityLoaderStatusChanged()
             // it crashes Qt3D
             for (auto node : m_sceneLoaderEntity->childNodes())
                 delete qobject_cast<Qt3DCore::QEntity *>(node);
-            delete m_sceneLoaderEntity;
+            // Can't delete yet, as sceneloader still does things after this method exits
+            m_sceneLoaderEntity->deleteLater();
             m_sceneLoaderEntity = nullptr;
             emit importEntityInProgressChanged(false);
         }
-- 
cgit v1.2.3