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

copy check for disabled or nested recomputes from old implementation of recompute()

Browse Source
This commit is contained in:
wmayer
2017-09-09 19:11:28 +02:00
parent a07790f0df
commit 7c93459ec2
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/App/Document.cpp
View File

@@ -2043,7 +2043,7 @@ int Document::recompute()
int objectCount = 0;
// The 'SkipRecompute' flag can be (tmp.) set to avoid to many
// The 'SkipRecompute' flag can be (tmp.) set to avoid too many
// time expensive recomputes
bool skip = testStatus(Document::SkipRecompute);
if (skip)
@@ -2165,7 +2165,21 @@ int Document::recompute()
int Document::recompute()
{
if (testStatus(Document::Recomputing)) {
// this is clearly a bug in the calling instance
throw Base::RuntimeError("Nested recomputes of a document are not allowed");
}
int objectCount = 0;
// The 'SkipRecompute' flag can be (tmp.) set to avoid too many
// time expensive recomputes
bool skip = testStatus(Document::SkipRecompute);
if (skip)
return 0;
ObjectStatusLocker<Document::Status, Document> exe(Document::Recomputing, this);
// delete recompute log
for (auto LogEntry: _RecomputeLog)
delete LogEntry;