diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2014-06-17 14:23:33 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@digia.com> | 2014-06-18 13:08:41 +0200 |
| commit | 6cee8a42ff1b56f35143e6011d70747913710091 (patch) | |
| tree | e14ad72d9408cdfd9c5613fb1728ebe471de010b | |
| parent | 029cd279c3309ebd50f06aad573af6e4431190cb (diff) | |
| download | qt-creator-6cee8a42ff1b56f35143e6011d70747913710091.tar.gz | |
QmlDesigner: Add test if the instance exists
Change-Id: I03f7e32aa0eda1f493c24ba174c706f4b8b0442c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 9 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp index 550ef7d10e..6cf8986c87 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp @@ -280,12 +280,13 @@ void NodeInstanceServer::removeProperties(const RemovePropertiesCommand &command void NodeInstanceServer::reparentInstances(const QVector<ReparentContainer> &containerVector) { foreach (const ReparentContainer &container, containerVector) { - ServerNodeInstance instance = instanceForId(container.instanceId()); - if (instance.isValid()) { - instance.reparent(instanceForId(container.oldParentInstanceId()), container.oldParentProperty(), instanceForId(container.newParentInstanceId()), container.newParentProperty()); + if (hasInstanceForId(container.instanceId())) { + ServerNodeInstance instance = instanceForId(container.instanceId()); + if (instance.isValid()) { + instance.reparent(instanceForId(container.oldParentInstanceId()), container.oldParentProperty(), instanceForId(container.newParentInstanceId()), container.newParentProperty()); + } } } - } void NodeInstanceServer::reparentInstances(const ReparentInstancesCommand &command) diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp index bba144af00..8ebf8b6eb9 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp @@ -280,12 +280,13 @@ void NodeInstanceServer::removeProperties(const RemovePropertiesCommand &command void NodeInstanceServer::reparentInstances(const QVector<ReparentContainer> &containerVector) { foreach (const ReparentContainer &container, containerVector) { - ServerNodeInstance instance = instanceForId(container.instanceId()); - if (instance.isValid()) { - instance.reparent(instanceForId(container.oldParentInstanceId()), container.oldParentProperty(), instanceForId(container.newParentInstanceId()), container.newParentProperty()); + if (hasInstanceForId(container.instanceId())) { + ServerNodeInstance instance = instanceForId(container.instanceId()); + if (instance.isValid()) { + instance.reparent(instanceForId(container.oldParentInstanceId()), container.oldParentProperty(), instanceForId(container.newParentInstanceId()), container.newParentProperty()); + } } } - } void NodeInstanceServer::reparentInstances(const ReparentInstancesCommand &command) |