From 1a8c972aefae75ee91295ea5a926cca71d95140a Mon Sep 17 00:00:00 2001
From: timoreo <timo.oreo34@gmail.com>
Date: Fri, 14 Jan 2022 20:22:15 +0100
Subject: Fixed icons Also having a mod loader is now enforced

---
 launcher/ui/pages/instance/ModFolderPage.cpp | 47 +++++++++++++++++-----------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'launcher/ui/pages/instance')

diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index d2f5dead..7ebf66f6 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -349,25 +349,34 @@ void ModFolderPage::on_actionInstall_mods_triggered()
     if(!m_controlsEnabled) {
         return;
     }
-    ModDownloadDialog mdownload(m_mods, this);
-    mdownload.exec();
-    ModDownloadTask * task = mdownload.getTask();
-    if(task){
-        connect(task, &Task::failed, [this](QString reason)
-        {
-            CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
-        });
-        connect(task, &Task::succeeded, [this, task]()
-        {
-            QStringList warnings = task->warnings();
-            if(warnings.count())
-            {
-                CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
-            }
-        });
-        ProgressDialog loadDialog(this);
-        loadDialog.setSkipButton(true, tr("Abort"));
-        loadDialog.execWithTask(task);
+    if(m_inst->typeName() != "Minecraft"){
+        return; //this is a null instance or a legacy instance
+    }
+    bool hasFabric = !((MinecraftInstance *)m_inst)->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
+    bool hasForge = !((MinecraftInstance *)m_inst)->getPackProfile()->getComponentVersion("net.minecraftforge").isEmpty();
+    if (!hasFabric && !hasForge) {
+        QMessageBox::critical(this,tr("Error"),tr("Please install a mod loader first !"));
+        return;
+    }
+    ModDownloadDialog mdownload(m_mods, this, m_inst);
+    if(mdownload.exec()) {
+        ModDownloadTask *task = mdownload.getTask();
+        if (task) {
+            connect(task, &Task::failed, [this](QString reason) {
+                CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
+            });
+            connect(task, &Task::succeeded, [this, task]() {
+                QStringList warnings = task->warnings();
+                if (warnings.count()) {
+                    CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'),
+                                                 QMessageBox::Warning)->show();
+                }
+            });
+            ProgressDialog loadDialog(this);
+            loadDialog.setSkipButton(true, tr("Abort"));
+            loadDialog.execWithTask(task);
+            m_mods->update();
+        }
     }
 }
 
-- 
cgit