From 564298bba5a4c830d8e14a9e59360c23ee6c5e0d Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 27 Oct 2022 18:11:48 +0200 Subject: [PATCH] qmldesigner: fix crash while switching modes Task-number: QDS-7984 Change-Id: Ia1803ce062c3956390c12f0da5b86577593fd721 Reviewed-by: Mahmoud Badri Reviewed-by: Reviewed-by: Miikka Heikkinen --- .../components/materialbrowser/materialbrowserview.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp index fcb52882f1d..89935205379 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp @@ -302,7 +302,7 @@ void MaterialBrowserView::modelAttached(Model *model) // Project load is already very busy and may even trigger puppet reset, so let's wait a moment // before refreshing the model - QTimer::singleShot(1000, this, [this]() { + QTimer::singleShot(1000, model, [this]() { refreshModel(true); loadPropertyGroups(); // Needs the delay because it uses metaInfo }); @@ -310,9 +310,6 @@ void MaterialBrowserView::modelAttached(Model *model) void MaterialBrowserView::refreshModel(bool updateImages) { - if (!model() || !model()->nodeInstanceView()) - return; - ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID); QList materials; @@ -581,7 +578,7 @@ void MaterialBrowserView::customNotification(const AbstractView *view, const QSt if (idx != -1) m_widget->materialBrowserModel()->selectMaterial(idx); } else if (identifier == "refresh_material_browser") { - QTimer::singleShot(0, this, [this]() { + QTimer::singleShot(0, model(), [this]() { refreshModel(true); }); } else if (identifier == "delete_selected_material") {