From df35d5eb142cc7926763f1c455e89444106ef4ee Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sun, 9 Nov 2025 10:44:23 +0000
Subject: [PATCH 1/2] Fix crash when modpack search is aborted

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/pages/modplatform/flame/FlameModel.cpp       | 4 ++++
 launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
index e5d880dca..da94a84c4 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
@@ -189,6 +189,10 @@ void ListModel::performPaginatedSearch()
 
     callbacks.on_succeed = [this](auto& doc) { searchRequestFinished(doc); };
     callbacks.on_fail = [this](QString reason, int) { searchRequestFailed(reason); };
+    callbacks.on_abort = [this] {
+	qCritical() << "Search task aborted by an unknown reason!";
+	searchRequestFailed("Aborted");
+    };
 
     auto netJob = api.searchProjects({ ModPlatform::ResourceType::Modpack, m_nextSearchOffset, m_currentSearchTerm, sort, m_filter->loaders,
                                        m_filter->versions, ModPlatform::Side::NoSide, m_filter->categoryIds, m_filter->openSource },
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index acd321d4b..ef6f314c1 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -159,6 +159,10 @@ void ModpackListModel::performPaginatedSearch()
 
     callbacks.on_succeed = [this](auto& doc) { searchRequestFinished(doc); };
     callbacks.on_fail = [this](QString reason, int) { searchRequestFailed(reason); };
+    callbacks.on_abort = [this] {
+	qCritical() << "Search task aborted by an unknown reason!";
+	searchRequestFailed("Aborted");
+    };
 
     auto netJob = api.searchProjects({ ModPlatform::ResourceType::Modpack, m_nextSearchOffset, m_currentSearchTerm, sort, m_filter->loaders,
                                        m_filter->versions, ModPlatform::Side::NoSide, m_filter->categoryIds, m_filter->openSource },

From 98afd2086a85e3c6a2866896e415274cae9a79e5 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sun, 9 Nov 2025 10:51:52 +0000
Subject: [PATCH 2/2] Make sure nullptr on_abort never gets called

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/modplatform/ResourceAPI.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/launcher/modplatform/ResourceAPI.cpp b/launcher/modplatform/ResourceAPI.cpp
index 448efbc24..b4e059b46 100644
--- a/launcher/modplatform/ResourceAPI.cpp
+++ b/launcher/modplatform/ResourceAPI.cpp
@@ -67,7 +67,10 @@ Task::Ptr ResourceAPI::searchProjects(SearchArgs&& args, Callback<QList<ModPlatf
         }
         callbacks.on_fail(reason, network_error_code);
     });
-    QObject::connect(netJob.get(), &NetJob::aborted, [callbacks] { callbacks.on_abort(); });
+    QObject::connect(netJob.get(), &NetJob::aborted, [callbacks] {
+        if (callbacks.on_abort != nullptr)
+            callbacks.on_abort();
+    });
 
     return netJob;
 }
@@ -135,7 +138,10 @@ Task::Ptr ResourceAPI::getProjectVersions(VersionSearchArgs&& args, Callback<QVe
         }
         callbacks.on_fail(reason, network_error_code);
     });
-    QObject::connect(netJob.get(), &NetJob::aborted, [callbacks] { callbacks.on_abort(); });
+    QObject::connect(netJob.get(), &NetJob::aborted, [callbacks] {
+        if (callbacks.on_abort != nullptr)
+            callbacks.on_abort();
+    });
 
     return netJob;
 }
@@ -182,7 +188,10 @@ Task::Ptr ResourceAPI::getProjectInfo(ProjectInfoArgs&& args, Callback<ModPlatfo
         }
         callbacks.on_fail(reason, network_error_code);
     });
-    QObject::connect(job.get(), &NetJob::aborted, [callbacks] { callbacks.on_abort(); });
+    QObject::connect(job.get(), &NetJob::aborted, [callbacks] {
+        if (callbacks.on_abort != nullptr)
+            callbacks.on_abort();
+    });
     return job;
 }