From 6c96ed457332689f54e7b6295db4230d77124f41 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 23 Sep 2010 15:32:47 +0200
Subject: [PATCH] QmlDesigner.NodeInstances: fix creation crash
---
.../qmldesigner/designercore/model/model.cpp | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 181418dbc84..623c848a3b7 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -431,8 +431,6 @@ void ModelPrivate::notifyPropertiesRemoved(const QList<PropertyPair> &propertyPa
bool resetModel = false;
QString description;
-
-
try {
if (rewriterView()) {
QList<AbstractProperty> propertyList;
@@ -579,18 +577,17 @@ void ModelPrivate::notifyNodeCreated(const InternalNode::Pointer &newInternalNod
resetModel = true;
}
+ if (nodeInstanceView()) {
+ ModelNode createdNode(newInternalNodePointer, model(), nodeInstanceView());
+ nodeInstanceView()->nodeCreated(createdNode);
+ }
+
foreach (const QWeakPointer<AbstractView> &view, m_viewList) {
Q_ASSERT(view != 0);
ModelNode createdNode(newInternalNodePointer, model(), view.data());
view->nodeCreated(createdNode);
}
-
- if (nodeInstanceView()) {
- ModelNode createdNode(newInternalNodePointer, model(), nodeInstanceView());
- nodeInstanceView()->nodeCreated(createdNode);
- }
-
if (resetModel) {
resetModelByRewriter(description);
}
--
GitLab