summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2012-10-11 13:32:27 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2012-10-12 10:33:59 +0200
commit16c5a1493d6380c0364108ab85fb80a1d1e4d6d4 (patch)
treed7e9dec7235b41d4ab40a70b5da02539857592dd
parent97cc22d6eee8ba56bc04398a9508ed66c8259c02 (diff)
downloadqt-creator-16c5a1493d6380c0364108ab85fb80a1d1e4d6d4.tar.gz
QmlDesigner.instances: crash fix
NodeInstanceServer::clearScene() deletes the objects. The m_designerSupport hold pointers to all objects for cleanup in destructor. Change-Id: I5ad4361d0c1de6f9eb9fb0d5cd80cf66717ce7fd Reviewed-by: Marco Bubke <marco.bubke@digia.com>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index dcbd513db6..2d88b9e610 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -143,9 +143,9 @@ void Qt5NodeInstanceServer::createScene(const CreateSceneCommand &command)
void Qt5NodeInstanceServer::clearScene(const ClearSceneCommand &command)
{
- NodeInstanceServer::clearScene(command);
delete m_designerSupport;
m_designerSupport = 0;
+ NodeInstanceServer::clearScene(command);
}
} // QmlDesigner