mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 01:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Destroy the data recovery before all documents

Browse Source 
We have to join the BackupObserver thread before we delete all docs,
if not we could use a deleted doc when deleting/joining the backup
observer thread.
This commit is contained in:
David Capello 2019-06-04 11:36:19 -03:00
parent f430b9ce77
commit be74723e37
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/app.cpp
View File

@ -405,11 +405,24 @@ void App::run()
} }
#endif // ENABLE_SCRIPTING #endif // ENABLE_SCRIPTING
// Destroy all documents in the UIContext. #ifdef ENABLE_UI
const Docs& docs = m_modules->m_context.documents(); if (isGui()) {
while (!docs.empty()) { // Destroy the window.
Doc* doc = docs.back(); m_mainWindow.reset(NULL);
// Delete backups (this is a normal shutdown, we are not handling
// exceptions, and we are not in a destructor).
m_modules->deleteDataRecovery();
}
#endif
// Destroy all documents from the UIContext.
std::vector<Doc*> docs;
for (Doc* doc : m_modules->m_context.closedDocs())
docs.push_back(doc);
for (Doc* doc : m_modules->m_context.documents())
docs.push_back(doc);
for (Doc* doc : docs) {
// First we close the document. In this way we receive recent // First we close the document. In this way we receive recent
// notifications related to the document as a app::Doc. If // notifications related to the document as a app::Doc. If
// we delete the document directly, we destroy the app::Doc // we delete the document directly, we destroy the app::Doc
@ -424,17 +437,6 @@ void App::run()
doc->close(); doc->close();
delete doc; delete doc;
} }
#ifdef ENABLE_UI
if (isGui()) {
// Destroy the window.
m_mainWindow.reset(NULL);
// Delete backups (this is a normal shutdown, we are not handling
// exceptions, and we are not in a destructor).
m_modules->deleteDataRecovery();
}
#endif
} }
// Finishes the Aseprite application. // Finishes the Aseprite application.