diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-04-23 10:37:35 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-04-24 08:59:18 +0000 |
| commit | 196d037239a6499e8b21dbbf35ef3d65765bcd6a (patch) | |
| tree | d86c90ccb894e0b03cfc36644d16ee6de437fc13 | |
| parent | 2970ef3dacda02fdf52ac25f3b93694eb06e6f7f (diff) | |
Scene3DRenderer: Do not call windowChanged lambda on destroyed object
By passing "this" as connect's third parameter we make sure that the
lambda in question is not called on destroyed objects.
Task-number: QTBUG-67324
Change-Id: I05c45b2ab7b4c81bbf462587515779cf4ef88232
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 898c11d13a1af0c70fc8d5902bf3da210d6c2faf)
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 1c9fec4d2..4822c7bc4 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -146,7 +146,7 @@ Scene3DRenderer::Scene3DRenderer(Scene3DItem *item, Qt3DCore::QAspectEngine *asp // So that we can schedule the cleanup QObject::connect(m_item, &QQuickItem::windowChanged, this, &Scene3DRenderer::onWindowChanged, Qt::QueuedConnection); // Main thread -> updates the rendering window - QObject::connect(m_item, &QQuickItem::windowChanged, [this] (QQuickWindow *w) { + QObject::connect(m_item, &QQuickItem::windowChanged, this, [this] (QQuickWindow *w) { QMutexLocker l(&m_windowMutex); m_window = w; }); |