From 974c28ee776d3cc80db5f1fbec7a9a2dd33446c8 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 10 Nov 2022 17:16:02 +0100 Subject: [PATCH] qmldesigner: fix possible crash Task-number: QDS-8246 Change-Id: I91cdf2887c73769adc1bb6d8965426b0ff7e6884 Reviewed-by: Reviewed-by: Thomas Hartmann --- .../connectioneditor/selectiondynamicpropertiesproxymodel.cpp | 3 ++- .../materialeditordynamicpropertiesproxymodel.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/connectioneditor/selectiondynamicpropertiesproxymodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/selectiondynamicpropertiesproxymodel.cpp index 00732479e81..7232e834132 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/selectiondynamicpropertiesproxymodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/selectiondynamicpropertiesproxymodel.cpp @@ -33,7 +33,8 @@ using namespace QmlDesigner::Internal; SelectionDynamicPropertiesProxyModel::SelectionDynamicPropertiesProxyModel(QObject *parent) : DynamicPropertiesProxyModel(parent) { - initModel(ConnectionView::instance()->dynamicPropertiesModel()); + if (ConnectionView::instance()) + initModel(ConnectionView::instance()->dynamicPropertiesModel()); } void SelectionDynamicPropertiesProxyModel::registerDeclarativeType() diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditordynamicpropertiesproxymodel.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditordynamicpropertiesproxymodel.cpp index 2a56561001f..147ecd1d5f0 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditordynamicpropertiesproxymodel.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditordynamicpropertiesproxymodel.cpp @@ -34,7 +34,8 @@ using namespace QmlDesigner; MaterialEditorDynamicPropertiesProxyModel::MaterialEditorDynamicPropertiesProxyModel(QObject *parent) : DynamicPropertiesProxyModel(parent) { - initModel(MaterialEditorView::instance()->dynamicPropertiesModel()); + if (MaterialEditorView::instance()) + initModel(MaterialEditorView::instance()->dynamicPropertiesModel()); } void MaterialEditorDynamicPropertiesProxyModel::registerDeclarativeType()