diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-04 23:49:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 23:49:54 +0100 |
| commit | 5e9b26dbef1c7cf917af17585c4282f58fc5eaef (patch) | |
| tree | 4e0369c91ad7ae025df1024f56ba4df17d42cfe0 /launcher/modplatform | |
| parent | 8f045af8679e9ae1da120eb56e4cec452284ac56 (diff) | |
| parent | 396a7994f9f485192b13f21a3dcf6710b50356ed (diff) | |
| download | PrismLauncher-5e9b26dbef1c7cf917af17585c4282f58fc5eaef.tar.gz PrismLauncher-5e9b26dbef1c7cf917af17585c4282f58fc5eaef.tar.bz2 PrismLauncher-5e9b26dbef1c7cf917af17585c4282f58fc5eaef.zip | |
Merge pull request #366 from TheLastRar/MSVC-Build
Diffstat (limited to 'launcher/modplatform')
| -rw-r--r-- | launcher/modplatform/ModAPI.h | 2 | ||||
| -rw-r--r-- | launcher/modplatform/modrinth/ModrinthPackManifest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/modplatform/ModAPI.h b/launcher/modplatform/ModAPI.h index c7408835..703de143 100644 --- a/launcher/modplatform/ModAPI.h +++ b/launcher/modplatform/ModAPI.h @@ -39,7 +39,7 @@ #include <QList> #include <list> -#include "Version.h" +#include "../Version.h" #include "net/NetJob.h" namespace ModPlatform { diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp index a4620df9..96f54067 100644 --- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp +++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp @@ -140,7 +140,7 @@ auto loadIndexedVersion(QJsonObject &obj) -> ModpackVersion for (auto file_iter : files) { File indexed_file; auto parent = Json::requireObject(file_iter); - auto is_primary = Json::ensureBoolean(parent, "primary", false); + auto is_primary = Json::ensureBoolean(parent, (const QString)QStringLiteral("primary"), false); if (!is_primary) { auto filename = Json::ensureString(parent, "filename"); // Checking suffix here is fine because it's the response from Modrinth, |