5 files changed, 35 insertions, 2 deletions
diff --git a/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp b/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp
index ad15b6e6..3a149944 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp
+++ b/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp
@@ -103,6 +103,8 @@ void ListModel::getLogo(const QString &logo, const QString &logoUrl, LogoCallbac
 
 void ListModel::request()
 {
+    m_aborted = false;
+
     beginResetModel();
     modpacks.clear();
     endResetModel();
@@ -117,6 +119,12 @@ void ListModel::request()
     QObject::connect(netJob, &NetJob::failed, this, &ListModel::requestFailed);
 }
 
+void ListModel::abortRequest()
+{
+    m_aborted = jobPtr->abort();
+    jobPtr.reset();
+}
+
 void ListModel::requestFinished()
 {
     jobPtr.reset();
@@ -162,6 +170,9 @@ void ListModel::requestPack()
 
 void ListModel::packRequestFinished()
 {
+    if (!jobPtr || m_aborted)
+        return;
+
     jobPtr.reset();
     remainingPacks.removeOne(currentPack);
 
diff --git a/launcher/ui/pages/modplatform/ftb/FtbListModel.h b/launcher/ui/pages/modplatform/ftb/FtbListModel.h
index 314cb789..d7a120f0 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbListModel.h
+++ b/launcher/ui/pages/modplatform/ftb/FtbListModel.h
@@ -47,9 +47,13 @@ public:
     QVariant data(const QModelIndex &index, int role) const override;
 
     void request();
+    void abortRequest();
 
     void getLogo(const QString &logo, const QString &logoUrl, LogoCallback callback);
 
+    [[nodiscard]] bool isMakingRequest() const { return jobPtr.get(); }
+    [[nodiscard]] bool wasAborted() const { return m_aborted; }
+
 private slots:
     void requestFinished();
     void requestFailed(QString reason);
@@ -65,6 +69,8 @@ private:
     void requestLogo(QString file, QString url);
 
 private:
+    bool m_aborted = false;
+
     QList<ModpacksCH::Modpack> modpacks;
     LogoMap m_logoMap;
 
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
index 8975d74e..b08f3bc4 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
@@ -73,6 +73,8 @@ FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
     connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &FtbPage::onSortingSelectionChanged);
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FtbPage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FtbPage::onVersionSelectionChanged);
+
+    ui->packDescription->setMetaEntry("FTBPacks");
 }
 
 FtbPage::~FtbPage()
@@ -105,7 +107,7 @@ void FtbPage::retranslate()
 
 void FtbPage::openedImpl()
 {
-    if(!initialised)
+    if(!initialised || listModel->wasAborted())
     {
         listModel->request();
         initialised = true;
@@ -114,6 +116,12 @@ void FtbPage::openedImpl()
     suggestCurrent();
 }
 
+void FtbPage::closedImpl()
+{
+    if (listModel->isMakingRequest())
+        listModel->abortRequest();
+}
+
 void FtbPage::suggestCurrent()
 {
     if(!isOpened)
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.h b/launcher/ui/pages/modplatform/ftb/FtbPage.h
index 90c8e7fd..631ae7f5 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.h
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.h
@@ -78,6 +78,7 @@ public:
     void retranslate() override;
 
     void openedImpl() override;
+    void closedImpl() override;
 
     bool eventFilter(QObject * watched, QEvent * event) override;
 
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.ui b/launcher/ui/pages/modplatform/ftb/FtbPage.ui
index 850bf091..8de0f4e6 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.ui
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.ui
@@ -57,7 +57,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QTextBrowser" name="packDescription">
+      <widget class="ProjectDescriptionPage" name="packDescription">
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -70,6 +70,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProjectDescriptionPage</class>
+   <extends>QTextBrowser</extends>
+   <header>ui/widgets/ProjectDescriptionPage.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>searchEdit</tabstop>
   <tabstop>versionSelectionBox</tabstop>