From c4316e81e64ad4ac63b0b50106b324a73abdc150 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sun, 26 Jun 2022 14:17:15 -0300
Subject: change: make Mod a QObject used as a pointer

Prevents problems when copying it around!

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/minecraft/MinecraftInstance.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'launcher/minecraft/MinecraftInstance.cpp')

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index abc022b6..360e754d 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -700,24 +700,24 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
         {
             out << QString("%1:").arg(label);
             auto modList = model.allMods();
-            std::sort(modList.begin(), modList.end(), [](Mod &a, Mod &b) {
-                auto aName = a.fileinfo().completeBaseName();
-                auto bName = b.fileinfo().completeBaseName();
+            std::sort(modList.begin(), modList.end(), [](Mod::Ptr a, Mod::Ptr b) {
+                auto aName = a->fileinfo().completeBaseName();
+                auto bName = b->fileinfo().completeBaseName();
                 return aName.localeAwareCompare(bName) < 0;
             });
-            for(auto & mod: modList)
+            for(auto mod: modList)
             {
-                if(mod.type() == Mod::MOD_FOLDER)
+                if(mod->type() == Mod::MOD_FOLDER)
                 {
-                    out << u8"  [📁] " + mod.fileinfo().completeBaseName() + " (folder)";
+                    out << u8"  [📁] " + mod->fileinfo().completeBaseName() + " (folder)";
                     continue;
                 }
 
-                if(mod.enabled()) {
-                    out << u8"  [✔️] " + mod.fileinfo().completeBaseName();
+                if(mod->enabled()) {
+                    out << u8"  [✔️]" + mod->fileinfo().completeBaseName();
                 }
                 else {
-                    out << u8"  [❌] " + mod.fileinfo().completeBaseName() + " (disabled)";
+                    out << u8"  [❌] " + mod->fileinfo().completeBaseName() + " (disabled)";
                 }
 
             }
@@ -1136,16 +1136,16 @@ std::shared_ptr<GameOptions> MinecraftInstance::gameOptionsModel() const
     return m_game_options;
 }
 
-QList< Mod > MinecraftInstance::getJarMods() const
+QList<Mod*> MinecraftInstance::getJarMods() const
 {
     auto profile = m_components->getProfile();
-    QList<Mod> mods;
+    QList<Mod*> mods;
     for (auto jarmod : profile->getJarMods())
     {
         QStringList jar, temp1, temp2, temp3;
         jarmod->getApplicableFiles(currentSystem, jar, temp1, temp2, temp3, jarmodsPath().absolutePath());
         // QString filePath = jarmodsPath().absoluteFilePath(jarmod->filename(currentSystem));
-        mods.push_back(Mod(QFileInfo(jar[0])));
+        mods.push_back(new Mod(QFileInfo(jar[0])));
     }
     return mods;
 }
-- 
cgit