From 32f8c66e022dba11d73e9aaa3d65d15f5dc87533 Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Wed, 16 Sep 2020 20:13:53 +0800 Subject: [PATCH] Gui: fix property editor transaction closing --- src/Gui/propertyeditor/PropertyEditor.cpp | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp index 6423753446..817372d2e5 100644 --- a/src/Gui/propertyeditor/PropertyEditor.cpp +++ b/src/Gui/propertyeditor/PropertyEditor.cpp @@ -239,21 +239,21 @@ void PropertyEditor::onItemActivated ( const QModelIndex & index ) void PropertyEditor::closeTransaction() { - if (autoupdate) { - App::Document* doc = App::GetApplication().getActiveDocument(); - if (doc) { - if (!doc->isTransactionEmpty()) { - // Between opening and committing a transaction a recompute - // could already have been done - if (doc->isTouched()) - doc->recompute(); + int tid = 0; + if(App::GetApplication().getActiveTransaction(&tid) && tid == transactionID) { + if (autoupdate) { + App::Document* doc = App::GetApplication().getActiveDocument(); + if (doc) { + if (!doc->isTransactionEmpty()) { + // Between opening and committing a transaction a recompute + // could already have been done + if (doc->isTouched()) + doc->recompute(); + } } } - } - - int tid = 0; - if(App::GetApplication().getActiveTransaction(&tid) && tid == transactionID) App::GetApplication().closeActiveTransaction(); + } } void PropertyEditor::closeEditor (QWidget * editor, QAbstractItemDelegate::EndEditHint hint)