From c4ff03d8b50507c07fd64b72c8d8c96ac8da097a Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 5 Dec 2016 14:41:45 +0100
Subject: [PATCH] QmlDesigner: Prevent potential nullptr access

Change-Id: Ia11e0968bfc1368e3485a4b5f0d0ea0fa95a7a3f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../connectioneditor/delegates.cpp               | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp
index 7611c3e72fb..e2a3c370efe 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp
+++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp
@@ -193,15 +193,6 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp
         QWidget *widget = QStyledItemDelegate::createEditor(parent, option, index);
 
         const DynamicPropertiesModel *model = qobject_cast<const DynamicPropertiesModel*>(index.model());
-
-        model->connectionView()->allModelNodes();
-
-//        PropertiesComboBox *dynamicPropertiesComboBox = qobject_cast<DynamicPropertiesComboBox*>(widget);
-
-//        if (!dynamicPropertiesComboBox) {
-//            return widget;
-//        }
-
         if (!model) {
             qWarning() << "BindingDelegate::createEditor no model";
             return widget;
@@ -211,6 +202,13 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp
             qWarning() << "BindingDelegate::createEditor no connection view";
             return widget;
         }
+        model->connectionView()->allModelNodes();
+
+//        PropertiesComboBox *dynamicPropertiesComboBox = qobject_cast<DynamicPropertiesComboBox*>(widget);
+
+//        if (!dynamicPropertiesComboBox) {
+//            return widget;
+//        }
 
         BindingProperty bindingProperty = model->bindingPropertyForRow(index.row());