aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-05-17 18:25:08 -0300
committerflow <flowlnlnln@gmail.com>2022-05-17 18:25:08 -0300
commitff9f3cb31ff75c2d657146cf8fe646084439fd0f (patch)
tree6c098648df6a4da447aa305420709037115f81f0 /launcher/modplatform/flame
parent17bbfe8d8951ddc7acca0222c6d2e38fb29eef25 (diff)
parentcc13310083fe8d0c3bb423fa3e31db7b1f7b25e1 (diff)
downloadPrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.tar.gz
PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.tar.bz2
PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.zip
fix conflicts with develop
Diffstat (limited to 'launcher/modplatform/flame')
-rw-r--r--launcher/modplatform/flame/FlamePackIndex.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp
index 549cace6..ac24c647 100644
--- a/launcher/modplatform/flame/FlamePackIndex.cpp
+++ b/launcher/modplatform/flame/FlamePackIndex.cpp
@@ -6,7 +6,7 @@ void Flame::loadIndexedPack(Flame::IndexedPack& pack, QJsonObject& obj)
{
pack.addonId = Json::requireInteger(obj, "id");
pack.name = Json::requireString(obj, "name");
- pack.websiteUrl = Json::ensureString(obj, "websiteUrl", "");
+ pack.websiteUrl = Json::ensureString(Json::ensureObject(obj, "links"), "websiteUrl", "");
pack.description = Json::ensureString(obj, "summary", "");
auto logo = Json::requireObject(obj, "logo");