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

qmldesigner: fix crash while switching modes

Browse Source 
Task-number: QDS-7984
Change-Id: Ia1803ce062c3956390c12f0da5b86577593fd721
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Tim Jenssen
2022-10-27 18:11:48 +02:00
parent ad3169bedd
commit 564298bba5
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 // Project load is already very busy and may even trigger puppet reset, so let's wait a moment
// before refreshing the model // before refreshing the model
QTimer::singleShot(1000, this, [this]() { QTimer::singleShot(1000, model, [this]() {
refreshModel(true); refreshModel(true);
loadPropertyGroups(); // Needs the delay because it uses metaInfo loadPropertyGroups(); // Needs the delay because it uses metaInfo
}); });
@@ -310,9 +310,6 @@ void MaterialBrowserView::modelAttached(Model *model)
void MaterialBrowserView::refreshModel(bool updateImages) void MaterialBrowserView::refreshModel(bool updateImages)
{ {
if (!model() || !model()->nodeInstanceView())
return;
ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID); ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID);
QList <ModelNode> materials; QList <ModelNode> materials;
@@ -581,7 +578,7 @@ void MaterialBrowserView::customNotification(const AbstractView *view, const QSt
if (idx != -1) if (idx != -1)
m_widget->materialBrowserModel()->selectMaterial(idx); m_widget->materialBrowserModel()->selectMaterial(idx);
} else if (identifier == "refresh_material_browser") { } else if (identifier == "refresh_material_browser") {
QTimer::singleShot(0, this, [this]() { QTimer::singleShot(0, model(), [this]() {
refreshModel(true); refreshModel(true);
}); });
} else if (identifier == "delete_selected_material") { } else if (identifier == "delete_selected_material") {