App: check active document before revert in Document::restore()

This commit is contained in:
Zheng, Lei
2019-09-05 09:36:24 +08:00
committed by wmayer
parent 05ca5b82e1
commit d4a83a9b52

View File

@@ -2372,6 +2372,7 @@ void Document::restore (const char *filename,
d->activeObject = 0;
bool signal = false;
Document *activeDoc = GetApplication().getActiveDocument();
if(d->objectArray.size()) {
signal = true;
GetApplication().signalDeleteDocument(*this);
@@ -2396,7 +2397,8 @@ void Document::restore (const char *filename,
if(signal) {
GetApplication().signalNewDocument(*this,true);
GetApplication().setActiveDocument(this);
if(activeDoc == this)
GetApplication().setActiveDocument(this);
}
if(!filename)