From a39ad9f7545d68d0117e62faccd278e41e46cce2 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Thu, 27 Apr 2023 17:54:57 +0300
Subject: 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>
---
 .../qml2puppet/instances/qt5informationnodeinstanceserver.cpp     | 8 +++++---
 1 file 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
 }
 
-- 
cgit v1.2.3