summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2023-04-27 17:54:57 +0300
committerThomas Hartmann <thomas.hartmann@qt.io>2023-05-02 16:12:43 +0000
commita39ad9f7545d68d0117e62faccd278e41e46cce2 (patch)
tree9c9f73efcd539843dd2da21161fafa440637a5fd
parent80372c2b7d5ef41c4f2fc8fa59828ee82eadea0a (diff)
downloadqt-creator-a39ad9f7545d68d0117e62faccd278e41e46cce2.tar.gz
QmlDesigner: Fix puppet crash on View3D removal
Fixes: QDS-9591 Change-Id: Idff3e996c66296863b7549b7d8649049497642e0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 8793639297..0d7b4fa215 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -827,9 +827,11 @@ void Qt5InformationNodeInstanceServer::handleView3DDestroyed([[maybe_unused]] QO
#ifdef QUICK3D_MODULE
auto view = qobject_cast<QQuick3DViewport *>(obj);
m_view3Ds.remove(obj);
- removeNode3D(view->scene());
- if (view && view == m_active3DView)
- m_active3DView = nullptr;
+ if (view) {
+ removeNode3D(view->scene());
+ if (view == m_active3DView)
+ m_active3DView = nullptr;
+ }
#endif
}