Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
This commit is contained in:
commit
2d51008304
159 changed files with 3568 additions and 1801 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue