4 files changed, 6 insertions, 20 deletions
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
index 283f9ce7..cff29a79 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
@@ -11,18 +11,10 @@ ListModel::ListModel(FlameModPage* parent) : ModPlatform::ListModel(parent) {}
 ListModel::~ListModel() {}
 
 
-void FlameMod::ListModel::searchRequestFinished()
+void FlameMod::ListModel::searchRequestFinished(QJsonDocument& doc)
 {
     jobPtr.reset();
 
-    QJsonParseError parse_error;
-    QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
-    if(parse_error.error != QJsonParseError::NoError) {
-        qWarning() << "Error while parsing JSON response from Flame at " << parse_error.offset << " reason: " << parse_error.errorString();
-        qWarning() << response;
-        return;
-    }
-
     QList<ModPlatform::IndexedPack> newList;
     auto packs = doc.array();
     for(auto packRaw : packs) {
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.h b/launcher/ui/pages/modplatform/flame/FlameModModel.h
index ae919e63..022ec32e 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModModel.h
@@ -30,7 +30,7 @@ class ListModel : public ModPlatform::ListModel {
     virtual ~ListModel();
 
    private slots:
-    void searchRequestFinished() override;
+    void searchRequestFinished(QJsonDocument& doc) override;
 
    private:
     const char** getSorts() const override;
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
index 6564265c..19f58280 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
@@ -36,23 +36,17 @@ FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance)
 
 bool FlameModPage::shouldDisplay() const { return true; }
 
-void FlameModPage::onRequestVersionsSucceeded(ModPage* instance, QByteArray* response, QString addonId)
+void FlameModPage::onRequestVersionsSucceeded(QJsonDocument& doc, QString addonId)
 {
     if (addonId != current.addonId) {
         return;  // wrong request
     }
-    QJsonParseError parse_error;
-    QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
-    if (parse_error.error != QJsonParseError::NoError) {
-        qWarning() << "Error while parsing JSON response from Flame at " << parse_error.offset << " reason: " << parse_error.errorString();
-        qWarning() << *response;
-        return;
-    }
+
     QJsonArray arr = doc.array();
     try {
         FlameMod::loadIndexedPackVersions(current, arr, APPLICATION->network(), m_instance);
     } catch (const JSONValidationError& e) {
-        qDebug() << *response;
+        qDebug() << doc;
         qWarning() << "Error while reading Flame mod version: " << e.cause();
     }
     auto packProfile = ((MinecraftInstance*)m_instance)->getPackProfile();
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.h b/launcher/ui/pages/modplatform/flame/FlameModPage.h
index 9c6f0e6c..f15b51ec 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.h
@@ -22,5 +22,5 @@ class FlameModPage : public ModPage {
     bool shouldDisplay() const override;
 
    private:
-    void onRequestVersionsSucceeded(ModPage*, QByteArray*, QString) override;
+    void onRequestVersionsSucceeded(QJsonDocument&, QString) override;
 };