summaryrefslogtreecommitdiffstats
path: root/editorlib
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2016-11-10 14:07:01 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2016-11-11 08:03:53 +0000
commit66bb01a6c28309bbcd5ba3827acf22645ca5618f (patch)
treee1351be7a13c59c93492748f42225129f49ca366 /editorlib
parent9caf7130d15852052f5d0de07d3bbc99792d486c (diff)
Delay sceneloader delete to avoid random crashes
Change-Id: I4618069686327c68ec02db16d37908b99e45799f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'editorlib')
-rw-r--r--editorlib/src/editorsceneitemmodel.cpp3
1 files changed, 2 insertions, 1 deletions
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);
}