1 files changed, 13 insertions, 11 deletions
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 9b70e7a1..a56ba8ab 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -38,11 +38,11 @@
 
 #include "minecraft/mod/MetadataHandler.h"
 
-ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir, bool is_indexed) 
-    : m_mods_dir(mods_dir), m_index_dir(index_dir), m_is_indexed(is_indexed), m_result(new Result())
+ModFolderLoadTask::ModFolderLoadTask(QDir mods_dir, QDir index_dir, bool is_indexed, bool clean_orphan, QObject* parent)
+    : Task(parent, false), m_mods_dir(mods_dir), m_index_dir(index_dir), m_is_indexed(is_indexed), m_clean_orphan(clean_orphan), m_result(new Result())
 {}
 
-void ModFolderLoadTask::run()
+void ModFolderLoadTask::executeTask()
 {
     if (m_is_indexed) {
         // Read metadata first
@@ -52,7 +52,7 @@ void ModFolderLoadTask::run()
     // Read JAR files that don't have metadata
     m_mods_dir.refresh();
     for (auto entry : m_mods_dir.entryInfoList()) {
-        Mod::Ptr mod(new Mod(entry));
+        Mod* mod(new Mod(entry));
 
         if (mod->enabled()) {
             if (m_result->mods.contains(mod->internal_id())) {
@@ -85,16 +85,18 @@ void ModFolderLoadTask::run()
 
     // Remove orphan metadata to prevent issues
     // See https://github.com/PolyMC/PolyMC/issues/996
-    QMutableMapIterator<QString, Mod::Ptr> iter(m_result->mods);
-    while (iter.hasNext()) {
-        auto mod = iter.next().value();
-        if (mod->status() == ModStatus::NotInstalled) {
-            mod->destroy(m_index_dir, false);
-            iter.remove();
+    if (m_clean_orphan) {
+        QMutableMapIterator<QString, Mod::Ptr> iter(m_result->mods);
+        while (iter.hasNext()) {
+            auto mod = iter.next().value();
+            if (mod->status() == ModStatus::NotInstalled) {
+                mod->destroy(m_index_dir, false);
+                iter.remove();
+            }
         }
     }
 
-    emit succeeded();
+    emitSucceeded();
 }
 
 void ModFolderLoadTask::getFromMetadata()