summaryrefslogtreecommitdiffstats
path: root/src/render/jobs/loadscenejob.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-27 11:29:04 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-04-28 19:38:09 +0000
commit7b146379230977f43fde60a0f5290689094ad84a (patch)
tree4ffc3052c239106511c8b62aba08d45faecb6160 /src/render/jobs/loadscenejob.cpp
parent7d3f9762b0cc53eced2ca4d199dbf447f9de71be (diff)
Only try to move scene subtree if non null
Change-Id: Iefca770a49e202712301e5f12f3c21f6bb0bff9d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/jobs/loadscenejob.cpp')
-rw-r--r--src/render/jobs/loadscenejob.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp
index 4353c2218..003d0f2dd 100644
--- a/src/render/jobs/loadscenejob.cpp
+++ b/src/render/jobs/loadscenejob.cpp
@@ -76,7 +76,8 @@ void LoadSceneJob::run()
// Set clone of sceneTree in sceneComponent. This will move the sceneSubTree
// to the QCoreApplication thread which is where the frontend object tree lives.
Scene *scene = m_managers->sceneManager()->lookupResource(m_sceneComponent);
- scene->setSceneSubtree(sceneSubTree);
+ if (scene && sceneSubTree)
+ scene->setSceneSubtree(sceneSubTree);
}
} // namespace Render