feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix crashes on mode change

Browse Source 
Fixes: QDS-8129
Change-Id: Iea76157c58f663244e8fd8de8ea26392d2b49b43
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Miikka Heikkinen
2022-10-31 17:31:31 +02:00
parent 836d964a9d
commit 33602af185
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
View File

@@ -310,6 +310,9 @@ void MaterialBrowserView::modelAttached(Model *model)
void MaterialBrowserView::refreshModel(bool updateImages) void MaterialBrowserView::refreshModel(bool updateImages)
{ {
if (!model())
return;
ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID); ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID);
QList <ModelNode> materials; QList <ModelNode> materials;
@@ -461,7 +464,7 @@ void MaterialBrowserView::nodeRemoved(const ModelNode &removedNode,
void QmlDesigner::MaterialBrowserView::loadPropertyGroups() void QmlDesigner::MaterialBrowserView::loadPropertyGroups()
{ {
if (!m_hasQuick3DImport || m_propertyGroupsLoaded) if (!m_hasQuick3DImport || m_propertyGroupsLoaded || !model())
return; return;
QString matPropsPath = model()->metaInfo("QtQuick3D.Material").importDirectoryPath() QString matPropsPath = model()->metaInfo("QtQuick3D.Material").importDirectoryPath()