Commit e086fc7d authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '1912'

parents b02d33f5 4e46e7df
Pipeline #11584 passed with stage
in 14 minutes
...@@ -427,11 +427,6 @@ bool ProjectManager::checkForBackupFile(const QUrl &url, bool newFile) ...@@ -427,11 +427,6 @@ bool ProjectManager::checkForBackupFile(const QUrl &url, bool newFile)
// Found orphaned autosave file // Found orphaned autosave file
orphanedFile = stale; orphanedFile = stale;
break; break;
} else {
// Another Kdenlive instance is probably handling this autosave file
staleFiles.removeAll(stale);
delete stale;
continue;
} }
} }
} }
...@@ -442,14 +437,13 @@ bool ProjectManager::checkForBackupFile(const QUrl &url, bool newFile) ...@@ -442,14 +437,13 @@ bool ProjectManager::checkForBackupFile(const QUrl &url, bool newFile)
doOpenFile(url, orphanedFile); doOpenFile(url, orphanedFile);
return true; return true;
} }
// remove the stale files
for (KAutoSaveFile *stale : staleFiles) {
stale->open(QIODevice::ReadWrite);
delete stale;
}
return false;
} }
// remove the stale files
for (KAutoSaveFile *stale : staleFiles) {
stale->open(QIODevice::ReadWrite);
delete stale;
}
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment