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

Core: Don't freeze application if lock file already exists

Browse Source
This commit is contained in:
wmayer
2024-11-01 15:02:22 +01:00
parent b7306d29e3
commit 7820ca7f73
2 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/DocumentRecovery.cpp
View File

@@ -651,12 +651,12 @@ void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(Q
QString exeName = QString::fromStdString(App::Application::getExecutableName());
QList<QFileInfo> locks = tmp.entryInfoList();
for (QList<QFileInfo>::iterator it = locks.begin(); it != locks.end(); ++it) {
QString bn = it->baseName();
for (const QFileInfo& it : locks) {
QString bn = it.baseName();
// ignore the lock file for this instance
QString pid = QString::number(QCoreApplication::applicationPid());
if (bn.startsWith(exeName) && bn.indexOf(pid) < 0) {
QString fn = it->absoluteFilePath();
QString fn = it.absoluteFilePath();
#if !defined(FC_OS_WIN32) || (BOOST_VERSION < 107600)
boost::interprocess::file_lock flock(fn.toUtf8());
@@ -665,7 +665,7 @@ void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(Q
#endif
if (flock.try_lock()) {
// OK, this file is a leftover from a previous crash
QString crashed_pid = bn.mid(exeName.length()+1);
QString crashed_pid = bn.mid(exeName.length() + 1);
// search for transient directories with this PID
QString filter;
QTextStream str(&filter);
@@ -674,7 +674,10 @@ void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(Q
tmp.setFilter(QDir::Dirs);
QList<QFileInfo> dirs = tmp.entryInfoList();
callableFunc(tmp, dirs, it->fileName());
callableFunc(tmp, dirs, it.fileName());
}
else {
Base::Console().Warning("Failed to lock file %s\n", fn.toUtf8().constData());
}
}
}