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

When we are restoring, don't set the Label on object creation as it will be restored later.

Browse Source 
This is to avoid potential duplicate label conflicts.

This fixes issue #3280.
This commit is contained in:
Eivind Kvedalen
2017-10-15 12:46:53 +02:00
committed by wmayer
parent 2ae1313975
commit 3b82ffff02
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/App/Document.cpp
View File

@@ -1315,6 +1315,8 @@ void Document::Save (Base::Writer &writer) const
void Document::Restore(Base::XMLReader &reader)
{
int i,Cnt;
Base::ObjectStatusLocker<Status, Document> restoreBit(Status::Restoring, this);
reader.readElement("Document");
long scheme = reader.getAttributeAsInteger("SchemaVersion");
reader.DocumentSchema = scheme;
@@ -2417,7 +2419,10 @@ DocumentObject * Document::addObject(const char* sType, const char* pObjectName,
// insert in the adjacence list and referenc through the ConectionMap
//_DepConMap[pcObject] = add_vertex(_DepList);
pcObject->Label.setValue( ObjectName );
// If we are restoring, don't set the Label object now; it will be restored later. This is to avoid potential duplicate
// label conflicts later.
if (!d->StatusBits.test(Restoring))
pcObject->Label.setValue( ObjectName );
// Call the object-specific initialization
if (!d->undoing && !d->rollback && isNew) {