From 6542f5f15af31e493c9b46afb3a5b4b330cc9cee Mon Sep 17 00:00:00 2001
From: timoreo <timo.oreo34@gmail.com>
Date: Fri, 20 May 2022 22:06:36 +0200
Subject: Apply suggestions

---
 launcher/modplatform/flame/PackManifest.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp
index c78783a0..3217a756 100644
--- a/launcher/modplatform/flame/PackManifest.cpp
+++ b/launcher/modplatform/flame/PackManifest.cpp
@@ -82,12 +82,13 @@ bool Flame::File::parseFromBytes(const QByteArray& bytes)
         // this is probably a mod, dunno what else could modpacks download
         targetFolder = "mods";
     }
-    if(!obj.contains("downloadUrl") || obj["downloadUrl"].isNull() || !obj["downloadUrl"].isString() || obj["downloadUrl"].toString().isEmpty()){
+    QString rawUrl = Json::ensureString(obj, "downloadUrl");
+
+    if(rawUrl.isEmpty()){
         //either there somehow is an emtpy string as a link, or it's null either way it's invalid
         //soft failing
         return false;
     }
-    QString rawUrl = Json::requireString(obj, "downloadUrl");
     url = QUrl(rawUrl, QUrl::TolerantMode);
     if (!url.isValid()) {
         throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
-- 
cgit