From 0eaff2214545b168f657baa6e42aaaaa664956a1 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 24 Oct 2022 23:00:02 +0200
Subject: [PATCH] Merge pull request #283 from flowln/fix_abort_on_autosearch

---
 .../modplatform/helpers/NetworkModAPI.cpp     |  1 +
 launcher/ui/pages/modplatform/ModModel.cpp    | 25 ++++++++++++-------
 launcher/ui/pages/modplatform/ModModel.h      |  1 +
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/launcher/modplatform/helpers/NetworkModAPI.cpp b/launcher/modplatform/helpers/NetworkModAPI.cpp
index 866e7540c..7633030e1 100644
--- a/launcher/modplatform/helpers/NetworkModAPI.cpp
+++ b/launcher/modplatform/helpers/NetworkModAPI.cpp
@@ -15,6 +15,7 @@ void NetworkModAPI::searchMods(CallerType* caller, SearchArgs&& args) const
 
     QObject::connect(netJob, &NetJob::started, caller, [caller, netJob] { caller->setActiveJob(netJob); });
     QObject::connect(netJob, &NetJob::failed, caller, &CallerType::searchRequestFailed);
+    QObject::connect(netJob, &NetJob::aborted, caller, &CallerType::searchRequestAborted);
     QObject::connect(netJob, &NetJob::succeeded, caller, [caller, response] {
         QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index 49766fa66..ed58eb32f 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -267,18 +267,25 @@ void ListModel::searchRequestFailed(QString reason)
                                   .arg(m_parent->displayName())
                                   .arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_DISPLAYNAME)));
     }
+
+    jobPtr.reset();
+    searchState = Finished;
+}
+
+void ListModel::searchRequestAborted()
+{
+    if (searchState != ResetRequested)
+        qCritical() << "Search task in ModModel aborted by an unknown reason!";
+
+    // Retry fetching
     jobPtr.reset();
 
-    if (searchState == ResetRequested) {
-        beginResetModel();
-        modpacks.clear();
-        endResetModel();
+    beginResetModel();
+    modpacks.clear();
+    endResetModel();
 
-        nextSearchOffset = 0;
-        performPaginatedSearch();
-    } else {
-        searchState = Finished;
-    }
+    nextSearchOffset = 0;
+    performPaginatedSearch();
 }
 
 void ListModel::infoRequestFinished(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index)
diff --git a/launcher/ui/pages/modplatform/ModModel.h b/launcher/ui/pages/modplatform/ModModel.h
index a58c7c55b..d2636d87e 100644
--- a/launcher/ui/pages/modplatform/ModModel.h
+++ b/launcher/ui/pages/modplatform/ModModel.h
@@ -51,6 +51,7 @@ class ListModel : public QAbstractListModel {
    public slots:
     void searchRequestFinished(QJsonDocument& doc);
     void searchRequestFailed(QString reason);
+    void searchRequestAborted();
 
     void infoRequestFinished(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index);