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

QmlDesigner: Fix crash on mode change

Browse Source 
Added model pointer validity checks into a few places.

Fixes: QDS-7191
Change-Id: I94beb134f4d9a0b1c7fc9dc87da1d02ad255beaa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2022-06-27 11:07:32 +03:00
committed by Thomas Hartmann
parent 21ef02a016
commit c97d056334
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,6 +290,8 @@ void MaterialBrowserView::instancesCompleted(const QVector<ModelNode> &completed
if (node.isRootNode()) { if (node.isRootNode()) {
m_puppetResetPending = false; m_puppetResetPending = false;
QTimer::singleShot(1000, this, [this]() { QTimer::singleShot(1000, this, [this]() {
if (!model() || !model()->nodeInstanceView())
return;
const QList<ModelNode> materials = m_widget->materialBrowserModel()->materials(); const QList<ModelNode> materials = m_widget->materialBrowserModel()->materials();
for (const ModelNode &node : materials) for (const ModelNode &node : materials)
model()->nodeInstanceView()->previewImageDataForGenericNode(node, {}); model()->nodeInstanceView()->previewImageDataForGenericNode(node, {});

7
src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
View File

@@ -416,6 +416,8 @@ void MaterialEditorView::handleToolBarAction(int action)
} }
case MaterialEditorContextObject::AddNewMaterial: { case MaterialEditorContextObject::AddNewMaterial: {
if (!model())
break;
executeInTransaction("MaterialEditorView:handleToolBarAction", [&] { executeInTransaction("MaterialEditorView:handleToolBarAction", [&] {
NodeMetaInfo metaInfo = model()->metaInfo("QtQuick3D.DefaultMaterial"); NodeMetaInfo metaInfo = model()->metaInfo("QtQuick3D.DefaultMaterial");
ModelNode newMatNode = createModelNode("QtQuick3D.DefaultMaterial", metaInfo.majorVersion(), ModelNode newMatNode = createModelNode("QtQuick3D.DefaultMaterial", metaInfo.majorVersion(),
@@ -634,7 +636,7 @@ void MaterialEditorView::auxiliaryDataChanged(const ModelNode &node, const Prope
// request render image for the selected material node // request render image for the selected material node
void MaterialEditorView::requestPreviewRender() void MaterialEditorView::requestPreviewRender()
{ {
if (m_selectedMaterial.isValid()) if (model() && model()->nodeInstanceView() && m_selectedMaterial.isValid())
model()->nodeInstanceView()->previewImageDataForGenericNode(m_selectedMaterial, {}); model()->nodeInstanceView()->previewImageDataForGenericNode(m_selectedMaterial, {});
} }
@@ -740,6 +742,9 @@ void MaterialEditorView::duplicateMaterial(const ModelNode &material)
{ {
QTC_ASSERT(material.isValid(), return); QTC_ASSERT(material.isValid(), return);
if (!model())
return;
TypeName matType = material.type(); TypeName matType = material.type();
QmlObjectNode sourceMat(material); QmlObjectNode sourceMat(material);