summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-10-31 17:31:31 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-10-31 15:36:07 +0000
commit33602af185d87ff473818bdee5fd0aa679980b55 (patch)
tree2a462c64a538a7418c1678670882f1826704c66f
parent836d964a9dc1c3ce7ebc2ba668dae8cf060638b5 (diff)
downloadqt-creator-33602af185d87ff473818bdee5fd0aa679980b55.tar.gz
QmlDesigner: Fix crashes on mode change
Fixes: QDS-8129 Change-Id: Iea76157c58f663244e8fd8de8ea26392d2b49b43 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
index 8993520537..a2263f3985 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
@@ -310,6 +310,9 @@ void MaterialBrowserView::modelAttached(Model *model)
void MaterialBrowserView::refreshModel(bool updateImages)
{
+ if (!model())
+ return;
+
ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID);
QList <ModelNode> materials;
@@ -461,7 +464,7 @@ void MaterialBrowserView::nodeRemoved(const ModelNode &removedNode,
void QmlDesigner::MaterialBrowserView::loadPropertyGroups()
{
- if (!m_hasQuick3DImport || m_propertyGroupsLoaded)
+ if (!m_hasQuick3DImport || m_propertyGroupsLoaded || !model())
return;
QString matPropsPath = model()->metaInfo("QtQuick3D.Material").importDirectoryPath()