Fixed icons

Also having a mod loader is now enforced

3 files changed, 7 insertions, 5 deletions

diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index 3bc70e34..0242465b 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -100,7 +100,7 @@ void ListModel::requestLogo(QString logo, QString url)
     }
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ModrinthPacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
-    NetJob *job = new NetJob(QString("Modrinth Icon Download %1").arg(logo), APPLICATION->network());
+    auto job = new NetJob(QString("Modrinth Icon Download %1").arg(logo), APPLICATION->network());
     job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
@@ -119,7 +119,6 @@ void ListModel::requestLogo(QString logo, QString url)
     });
 
     job->start();
-
     m_loadingLogos.append(logo);
 }
 
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index b68597ac..e72a57f6 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -9,9 +9,11 @@
 #include "InstanceImportTask.h"
 #include "ModrinthModel.h"
 #include "ModDownloadTask.h"
+#include "ui/pages/instance/ModFolderPage.h"
+#include "minecraft/PackProfile.h"
 
-ModrinthPage::ModrinthPage(ModDownloadDialog* dialog, QWidget *parent)
-    : QWidget(parent), ui(new Ui::ModrinthPage), dialog(dialog)
+ModrinthPage::ModrinthPage(ModDownloadDialog *dialog, BaseInstance *instance)
+    : QWidget(dialog), ui(new Ui::ModrinthPage), dialog(dialog), m_instance(instance)
 {
     ui->setupUi(this);
     connect(ui->searchButton, &QPushButton::clicked, this, &ModrinthPage::triggerSearch);
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index 1f7b12af..59671d0e 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -38,7 +38,7 @@ class ModrinthPage : public QWidget, public BasePage
     Q_OBJECT
 
 public:
-    explicit ModrinthPage(ModDownloadDialog* dialog, QWidget *parent = 0);
+    explicit ModrinthPage(ModDownloadDialog *dialog, BaseInstance *instance);
     virtual ~ModrinthPage();
     virtual QString displayName() const override
     {
@@ -77,4 +77,5 @@ private:
     Modrinth::IndexedPack current;
 
     QString selectedVersion;
+    BaseInstance *m_instance;
 };