diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2018-02-06 11:33:27 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2018-02-06 11:55:15 +0000 |
commit | 037ef30a55fd6fb730954ec3f7224121c52de95d (patch) | |
tree | d54bc2013642bddac539933f40efec6f869b64f5 /src/quick3d | |
parent | 0403ee45736241aa621eb3d38880a4fff571fd96 (diff) | |
parent | 13f340c92bdf725d214ab4840fc2e071d12d6e00 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I72fdfb9a20be2f819542243e888756818b03c28e
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index 67bb1a671..7e3334f00 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -123,7 +123,7 @@ Scene2D::Scene2D() , m_mouseEnabled(true) , m_renderPolicy(Qt3DRender::Quick::QScene2D::Continuous) { - renderThreadClientCount->fetchAndAddAcquire(1); + } Scene2D::~Scene2D() @@ -146,6 +146,8 @@ void Scene2D::initializeSharedObject() return; } + renderThreadClientCount->fetchAndAddAcquire(1); + renderThread->setObjectName(QStringLiteral("Scene2D::renderThread")); m_renderThread = renderThread; m_sharedObject->m_renderThread = m_renderThread; @@ -413,10 +415,11 @@ void Scene2D::cleanup() m_sharedObject->wake(); m_sharedObject = nullptr; } - - renderThreadClientCount->fetchAndSubAcquire(1); - if (renderThreadClientCount->load() == 0) - renderThread->quit(); + if (m_renderThread) { + renderThreadClientCount->fetchAndSubAcquire(1); + if (renderThreadClientCount->load() == 0) + renderThread->quit(); + } } |