ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Merge pull request #2906 from TheKodeToad/no-recursive-remove-on-update

Browse Source 
Prevent directories from being removed on instance update
This commit is contained in:
Alexandru Ionut Tripon 2024-10-13 09:48:27 +03:00 committed by GitHub
commit bd01c47dc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
launcher/InstanceCreationTask.cpp
View File

@ -38,22 +38,29 @@ void InstanceCreationTask::executeTask()
// files scheduled to, and we'd better not let the user abort in the middle of it, since it'd // files scheduled to, and we'd better not let the user abort in the middle of it, since it'd
// put the instance in an invalid state. // put the instance in an invalid state.
if (shouldOverride()) { if (shouldOverride()) {
bool deleteFailed = false;
setAbortable(false); setAbortable(false);
setStatus(tr("Removing old conflicting files...")); setStatus(tr("Removing old conflicting files..."));
qDebug() << "Removing old files"; qDebug() << "Removing old files";
for (auto path : m_files_to_remove) { for (const QString& path : m_files_to_remove) {
if (!QFile::exists(path)) if (!QFile::exists(path))
continue; continue;
qDebug() << "Removing" << path; qDebug() << "Removing" << path;
if (!FS::deletePath(path)) {
qCritical() << "Couldn't remove the old conflicting files."; if (!QFile::remove(path)) {
emitFailed(tr("Failed to remove old conflicting files.")); qCritical() << "Could not remove" << path;
return; deleteFailed = true;
} }
} }
if (deleteFailed) {
emitFailed(tr("Failed to remove old conflicting files."));
return;
}
} }
emitSucceeded(); emitSucceeded();
return;
} }