From 2e95916e7cafeb70e802fdf9b1af6ced4db10ddf Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 30 Oct 2019 17:28:21 +0100 Subject: [PATCH] QmlDesigner: Fix usage of transaction We have to update the model _inside_ the transaction of course. Without this patch the last changes were done after the transaction was already closed. Task-number: QDS-1194 Change-Id: I1061990f8b713ee5c25737b8eb173866fb495511 Reviewed-by: Miikka Heikkinen --- .../qmldesigner/designercore/instances/nodeinstanceview.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 6bce4dde4df..fd17c83551c 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -1225,8 +1225,6 @@ void NodeInstanceView::valuesModified(const ValuesModifiedCommand &command) if (command.transactionOption == ValuesModifiedCommand::TransactionOption::Start) startPuppetTransaction(); - else if (command.transactionOption == ValuesModifiedCommand::TransactionOption::End) - endPuppetTransaction(); for (const PropertyValueContainer &container : command.valueChanges()) { if (hasInstanceForId(container.instanceId())) { @@ -1239,6 +1237,9 @@ void NodeInstanceView::valuesModified(const ValuesModifiedCommand &command) } } } + + if (command.transactionOption == ValuesModifiedCommand::TransactionOption::End) + endPuppetTransaction(); } void NodeInstanceView::pixmapChanged(const PixmapChangedCommand &command)