From b9cc9c9bfafdd5623b9550cd96c9ab3b6615c8ce Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 5 Oct 2020 19:26:13 +0200 Subject: [PATCH] QmlDesigner: Fix crash We have to check if the view is actually detached. Change-Id: I160c1a15f921092ef66999ed6a27ffcdbbe205d9 Reviewed-by: Thomas Hartmann --- .../components/connectioneditor/bindingmodel.cpp | 6 ++++-- .../components/connectioneditor/dynamicpropertiesmodel.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp index 8f15a18c94f..0470798aeca 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp @@ -56,8 +56,10 @@ void BindingModel::resetModel() setHorizontalHeaderLabels( QStringList({tr("Item"), tr("Property"), tr("Source Item"), tr("Source Property")})); - for (const ModelNode modelNode : connectionView()->selectedModelNodes()) - addModelNode(modelNode); + if (connectionView()->isAttached()) { + for (const ModelNode modelNode : connectionView()->selectedModelNodes()) + addModelNode(modelNode); + } endResetModel(); } diff --git a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp index c1f27f16e73..51f5722df28 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp @@ -131,8 +131,10 @@ void DynamicPropertiesModel::resetModel() setHorizontalHeaderLabels( QStringList({tr("Item"), tr("Property"), tr("Property Type"), tr("Property Value")})); - for (const ModelNode modelNode : connectionView()->selectedModelNodes()) - addModelNode(modelNode); + if (connectionView()->isAttached()) { + for (const ModelNode modelNode : connectionView()->selectedModelNodes()) + addModelNode(modelNode); + } endResetModel(); }