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

+ delete transient directory if sub-directory fc_recovery_files is empty

Browse Source
This commit is contained in:
wmayer 2016-03-27 11:32:29 +02:00
parent b86e14afff
commit 7993938ab6
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/Application.cpp
View File

@ -1842,6 +1842,7 @@ void Application::checkForPreviousCrashes()
} }
else { else {
int countDeletedDocs = 0; int countDeletedDocs = 0;
QString recovery_files = QString::fromLatin1("fc_recovery_files");
for (QList<QFileInfo>::iterator it = dirs.begin(); it != dirs.end(); ++it) { for (QList<QFileInfo>::iterator it = dirs.begin(); it != dirs.end(); ++it) {
QDir doc_dir(it->absoluteFilePath()); QDir doc_dir(it->absoluteFilePath());
doc_dir.setFilter(QDir::NoDotAndDotDot|QDir::AllEntries); doc_dir.setFilter(QDir::NoDotAndDotDot|QDir::AllEntries);
@ -1857,6 +1858,17 @@ void Application::checkForPreviousCrashes()
// store the transient directory in case it's not empty // store the transient directory in case it's not empty
restoreDocFiles << *it; restoreDocFiles << *it;
} }
// search for the 'fc_recovery_files' sub-directory and check that it's the only entry
else if (entries == 1 && doc_dir.exists(recovery_files)) {
// if the sub-directory is empty delete the transient directory
QDir rec_dir(doc_dir.absoluteFilePath(recovery_files));
rec_dir.setFilter(QDir::NoDotAndDotDot|QDir::AllEntries);
if (rec_dir.entryList().isEmpty()) {
doc_dir.rmdir(recovery_files);
if (tmp.rmdir(it->filePath()))
countDeletedDocs++;
}
}
} }
// all directories corresponding to the lock file have been deleted // all directories corresponding to the lock file have been deleted