diff options
| author | Jamie Mansfield <jmansfield@cadixdev.org> | 2022-05-23 20:14:23 +0100 |
|---|---|---|
| committer | Jamie Mansfield <jmansfield@cadixdev.org> | 2022-05-23 20:57:15 +0100 |
| commit | 101ca60b2bb1d3c3047bc5842461c68d05708e39 (patch) | |
| tree | c74b66fa9615ca1ade0d39fc984642c2b568ed4d /launcher/modplatform/atlauncher/ATLPackManifest.cpp | |
| parent | f28a0aa666565354e657dec59249aa1fd237cdb0 (diff) | |
| download | PrismLauncher-101ca60b2bb1d3c3047bc5842461c68d05708e39.tar.gz PrismLauncher-101ca60b2bb1d3c3047bc5842461c68d05708e39.tar.bz2 PrismLauncher-101ca60b2bb1d3c3047bc5842461c68d05708e39.zip | |
ATLauncher: Handle extra arguments depends
Diffstat (limited to 'launcher/modplatform/atlauncher/ATLPackManifest.cpp')
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackManifest.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp index cec9896b..3af02a09 100644 --- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp +++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp @@ -218,6 +218,12 @@ static void loadVersionMainClass(ATLauncher::PackVersionMainClass& m, QJsonObjec m.depends = Json::ensureString(obj, "depends", ""); } +static void loadVersionExtraArguments(ATLauncher::PackVersionExtraArguments& a, QJsonObject& obj) +{ + a.arguments = Json::ensureString(obj, "arguments", ""); + a.depends = Json::ensureString(obj, "depends", ""); +} + void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj) { v.version = Json::requireString(obj, "version"); @@ -231,7 +237,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj) if(obj.contains("extraArguments")) { auto arguments = Json::requireObject(obj, "extraArguments"); - v.extraArguments = Json::ensureString(arguments, "arguments", ""); + loadVersionExtraArguments(v.extraArguments, arguments); } if(obj.contains("loader")) { |