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

PropertyExpressionEngine/DocumentObject: Track object deletes and update dependencies accordingly.

Browse Source
This commit is contained in:
Eivind Kvedalen
2015-12-20 01:15:22 +01:00
committed by wmayer
parent 7b25d454b5
commit df660dc280
4 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/DocumentObject.cpp
View File

@@ -305,6 +305,10 @@ void DocumentObject::connectRelabelSignals()
if (!onRelabledObjectConnection.connected())
onRelabledObjectConnection = getDocument()->signalRelabelObject.connect(boost::bind(&PropertyExpressionEngine::slotObjectRenamed, &ExpressionEngine, _1));
// Connect to signalDeletedObject, to properly track deletion of other objects that might be referenced in an expression
if (!onDeletedObjectConnection.connected())
onDeletedObjectConnection = getDocument()->signalDeletedObject.connect(boost::bind(&PropertyExpressionEngine::slotObjectDeleted, &ExpressionEngine, _1));
try {
// Crude method to resolve all expression dependencies
ExpressionEngine.execute();
@@ -317,5 +321,6 @@ void DocumentObject::connectRelabelSignals()
// Disconnect signals; nothing to track now
onRelabledObjectConnection.disconnect();
onRelabledDocumentConnection.disconnect();
onDeletedObjectConnection.disconnect();
}
}