aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2022-05-09 16:35:14 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2022-05-19 09:39:49 +0000
commit43700fa6211cde10a1137ecd0c5cce4eae65b85d (patch)
treec2764b37d806a2e316a1c4f8f9286ab6c86c1506
parentbf96cd2496adc1513d10228630fea7f01c4c8136 (diff)
QmlDesigner: Fix crash on shutdown
Change-Id: I47e20e14fe22dcad77a65b031cf65bc80bad3490 Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/edit3d/edit3dview.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
index 7206171dc7..ac4cc1947b 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
@@ -220,8 +220,10 @@ 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);
+ if (edit3DWidget() && edit3DWidget()->canvas()) {
+ m_canvasCache.insert(model, edit3DWidget()->canvas()->renderImage());
+ edit3DWidget()->showCanvas(false);
+ }
AbstractView::modelAboutToBeDetached(model);
}