kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: [skip ci] fix printing warning for recursive calls of Document::_commitTransaction

Browse Source
This commit is contained in:
wmayer
2020-10-23 20:50:23 +02:00
parent fbcf8dfa5d
commit cd0dfe1e87
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/App/Document.cpp
View File

@@ -1218,11 +1218,16 @@ void Document::commitTransaction() {
void Document::_commitTransaction(bool notify)
{
if(isPerformingTransaction() || d->committing) {
if (isPerformingTransaction()) {
if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG))
FC_WARN("Cannot commit transaction while transacting");
return;
}
else if (d->committing) {
// for a recursive call return without printing a warning
return;
}
if (d->activeUndoTransaction) {
Base::FlagToggler<> flag(d->committing);
Application::TransactionSignaller signaller(false,true);
@@ -1237,7 +1242,8 @@ void Document::_commitTransaction(bool notify)
}
signalCommitTransaction(*this);
if(notify)
// closeActiveTransaction() may call again _commitTransaction()
if (notify)
GetApplication().closeActiveTransaction(false,id);
}
}