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

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-24 11:47:45 +03:00
parent 55f740453c 6352362907
commit d5c5f5d4fc
108 changed files with 1549 additions and 574 deletions
--- a/launcher/minecraft/mod/Resource.cpp
+++ b/launcher/minecraft/mod/Resource.cpp
@@ -159,15 +159,14 @@ bool Resource::enable(EnableAction action)
        if (!path.endsWith(".disabled"))
            return false;
        path.chop(9);
-
-        if (!file.rename(path))
-            return false;
    } else {
        path += ".disabled";
-
-        if (!file.rename(path))
-            return false;
+        if (QFile::exists(path)) {
+            path = FS::getUniqueResourceName(path);
+        }
    }
+    if (!file.rename(path))
+        return false;

    setFile(QFileInfo(path));