Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle

2 files changed, 6 insertions, 6 deletions

diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index 264019f8..60389753 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -1,9 +1,9 @@
 #include "LocalModParseTask.h"
 
+#include <qdcss.h>
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 #include <toml++/toml.h>
-#include <qdcss.h>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -369,12 +369,11 @@ ModDetails ReadQuiltModInfo(QByteArray contents)
                 details.icon_file = icon.toString();
             }
         }
-
     }
     return details;
 }
 
-ModDetails ReadForgeInfo(QString fileName)
+ModDetails ReadForgeInfo(QByteArray contents)
 {
     ModDetails details;
     // Read the data
@@ -382,7 +381,7 @@ ModDetails ReadForgeInfo(QString fileName)
     details.mod_id = "Forge";
     details.homeurl = "http://www.minecraftforge.net/forum/";
     INIFile ini;
-    if (!ini.loadFile(fileName))
+    if (!ini.loadFile(contents))
         return details;
 
     QString major = ini.get("forge.major.number", "0").toString();
@@ -554,7 +553,7 @@ bool processZIP(Mod& mod, ProcessingLevel level)
             return false;
         }
 
-        details = ReadForgeInfo(file.getFileName());
+        details = ReadForgeInfo(file.readAll());
         file.close();
         zip.close();
 
diff --git a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
index fa7d7f4a..0894049c 100644
--- a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
@@ -44,7 +44,8 @@ static const QMap<PackedResourceType, QString> s_packed_type_names = {
 namespace ResourceUtils {
 PackedResourceType identify(QFileInfo file){
     if (file.exists() && file.isFile()) {
-        if (ModUtils::validate(file)) { // Mods can also contain resource and data packs
+        if (ModUtils::validate(file)) {
+            // mods can contain resource and data packs so they must be tested first
             qDebug() << file.fileName() << "is a mod";
             return PackedResourceType::Mod;
         } else if (ResourcePackUtils::validate(file)) {