From a984e9c097fe950acbfe1e960783634363182158 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Thu, 28 Apr 2022 10:23:02 +0300
Subject: [PATCH] QmlDesigner: Fix possible crash on exit

Crash log:
https://sentry.io/organizations/the-qt-company-00/issues/3227370374/?project=5421708

Change-Id: I73b574d565cc1f66ddec1fedcb96e3acd7c1ad72
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/edit3d/edit3dview.cpp          | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
index 31056c0ed29..7206171dc7c 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
@@ -23,23 +23,24 @@
 **
 ****************************************************************************/
 
+#include "designmodewidget.h"
+#include "edit3dactions.h"
+#include "edit3dcanvas.h"
 #include "edit3dview.h"
 #include "edit3dwidget.h"
-#include "edit3dcanvas.h"
-#include "edit3dactions.h"
-#include "designmodewidget.h"
 
-#include <nodeinstanceview.h>
-#include <designeractionmanager.h>
-#include <designersettings.h>
-#include <qmldesignerconstants.h>
-#include <qmldesignerplugin.h>
-#include <viewmanager.h>
-#include <qmldesignericons.h>
-#include <designmodecontext.h>
-#include <utils/utilsicons.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/messagebox.h>
+#include <designeractionmanager.h>
+#include <designersettings.h>
+#include <designmodecontext.h>
+#include <nodeinstanceview.h>
+#include <qmldesignerconstants.h>
+#include <qmldesignericons.h>
+#include <qmldesignerplugin.h>
+#include <viewmanager.h>
+#include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 
 #include <QDebug>
 #include <QToolButton>
@@ -216,6 +217,8 @@ void Edit3DView::modelAttached(Model *model)
 
 void Edit3DView::modelAboutToBeDetached(Model *model)
 {
+    QTC_ASSERT(edit3DWidget()->canvas(), return);
+
     // Hide the canvas when model is detached (i.e. changing documents)
     m_canvasCache.insert(model, edit3DWidget()->canvas()->renderImage());
     edit3DWidget()->showCanvas(false);