suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

break dependency to deleted object on rollback

Browse Source
This commit is contained in:
wmayer 2016-11-06 15:09:42 +01:00
parent 60e6ad2e52
commit bbf5548899
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/App/Document.cpp
View File

@ -2087,7 +2087,7 @@ void Document::remObject(const char* sName)
breakDependency(pos->second, true);
//and remove the tip if needed
if(Tip.getValue() && strcmp(Tip.getValue()->getNameInDocument(), sName)==0) {
if (Tip.getValue() && strcmp(Tip.getValue()->getNameInDocument(), sName)==0) {
Tip.setValue(nullptr);
TipName.setValue("");
}
@ -2145,16 +2145,15 @@ void Document::_remObject(DocumentObject* pcObject)
}
// do no transactions if we do a rollback!
if (!d->rollback) {
if (!d->rollback && d->activeUndoTransaction) {
// Undo stuff
if (d->activeUndoTransaction) {
signalTransactionRemove(*pcObject, d->activeUndoTransaction);
d->activeUndoTransaction->addObjectNew(pcObject);
}
signalTransactionRemove(*pcObject, d->activeUndoTransaction);
d->activeUndoTransaction->addObjectNew(pcObject);
}
else {
// for a rollback delete the object
signalTransactionRemove(*pcObject, 0);
breakDependency(pcObject, true);
}
// remove from map