feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.nodeInstances: bugfix for state editing

Browse Source 
The state activeStateInstance() was always invalid as a side effect
of calling deactivateState() before.

So we always changed back to the base state when removing an item.

Reviewed-by: Kai Koehne
This commit is contained in:
Thomas Hartmann
2011-03-22 12:35:56 +01:00
parent e8984f09f1
commit e828c425b5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp
View File

@@ -258,6 +258,7 @@ void NodeInstanceServer::clearScene(const ClearSceneCommand &/*command*/)
void NodeInstanceServer::removeInstances(const RemoveInstancesCommand &command) void NodeInstanceServer::removeInstances(const RemoveInstancesCommand &command)
{ {
ServerNodeInstance oldState = activeStateInstance();
if (activeStateInstance().isValid()) if (activeStateInstance().isValid())
activeStateInstance().deactivateState(); activeStateInstance().deactivateState();
@@ -265,9 +266,8 @@ void NodeInstanceServer::removeInstances(const RemoveInstancesCommand &command)
removeInstanceRelationsip(instanceId); removeInstanceRelationsip(instanceId);
} }
if (activeStateInstance().isValid()) if (oldState.isValid())
activeStateInstance().activateState(); oldState.activateState();
refreshBindings(); refreshBindings();
startRenderTimer(); startRenderTimer();