Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod

This commit is contained in:
Trial97 2024-06-14 21:05:11 +03:00
commit 2d51008304
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
159 changed files with 3568 additions and 1801 deletions

View file

@ -972,7 +972,6 @@ bool InstanceList::commitStagedInstance(const QString& path,
if (groupName.isEmpty() && !groupName.isNull())
groupName = QString();
QDir dir;
QString instID;
InstancePtr inst;
@ -996,7 +995,7 @@ bool InstanceList::commitStagedInstance(const QString& path,
return false;
}
} else {
if (!dir.rename(path, destination)) {
if (!FS::move(path, destination)) {
qWarning() << "Failed to move" << path << "to" << destination;
return false;
}