From 85d5e9ff2385b7f96d295f7affb459fdb16e2145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 7 Feb 2021 23:51:10 +0100 Subject: [PATCH] NOISSUE fix some build fails on linux and windows --- api/logic/modplatform/atlauncher/ATLPackIndex.cpp | 2 +- api/logic/modplatform/atlauncher/ATLPackManifest.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/logic/modplatform/atlauncher/ATLPackIndex.cpp b/api/logic/modplatform/atlauncher/ATLPackIndex.cpp index 4d2cf153..35f50b18 100644 --- a/api/logic/modplatform/atlauncher/ATLPackIndex.cpp +++ b/api/logic/modplatform/atlauncher/ATLPackIndex.cpp @@ -26,7 +26,7 @@ void ATLauncher::loadIndexedPack(ATLauncher::IndexedPack & m, QJsonObject & obj) loadIndexedVersion(version, versionObj); m.versions.append(version); } - m.system = Json::ensureBoolean(obj, "system", false); + m.system = Json::ensureBoolean(obj, QString("system"), false); m.description = Json::ensureString(obj, "description", ""); m.safeName = Json::requireString(obj, "name").replace(QRegularExpression("[^A-Za-z0-9]"), ""); diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp b/api/logic/modplatform/atlauncher/ATLPackManifest.cpp index de3ec232..a31530f8 100644 --- a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp +++ b/api/logic/modplatform/atlauncher/ATLPackManifest.cpp @@ -81,9 +81,9 @@ static ATLauncher::ModType parseModType(QString rawType) { static void loadVersionLoader(ATLauncher::VersionLoader & p, QJsonObject & obj) { p.type = Json::requireString(obj, "type"); - p.latest = Json::ensureBoolean(obj, "latest", false); - p.choose = Json::ensureBoolean(obj, "choose", false); - p.recommended = Json::ensureBoolean(obj, "recommended", false); + p.latest = Json::ensureBoolean(obj, QString("latest"), false); + p.choose = Json::ensureBoolean(obj, QString("choose"), false); + p.recommended = Json::ensureBoolean(obj, QString("recommended"), false); auto metadata = Json::requireObject(obj, "metadata"); p.version = Json::requireString(metadata, "version"); @@ -141,7 +141,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj) { v.version = Json::requireString(obj, "version"); v.minecraft = Json::requireString(obj, "minecraft"); - v.noConfigs = Json::ensureBoolean(obj, "noConfigs", false); + v.noConfigs = Json::ensureBoolean(obj, QString("noConfigs"), false); if(obj.contains("mainClass")) { auto main = Json::requireObject(obj, "mainClass");