From d4f2059b78bd53fccb20657d11b3386e427ec795 Mon Sep 17 00:00:00 2001
From: clickdevin <git@clickdevin.me>
Date: Wed, 14 Jun 2023 10:42:37 -0400
Subject: Fix bugs when updating curseforge modpacks

Signed-off-by: clickdevin <git@clickdevin.me>
---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index dae93d1c..35443e71 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -153,6 +153,9 @@ bool FlameCreationTask::updateInstance()
 
                     old_files.remove(file.key());
                     files_iterator = files.erase(files_iterator);
+
+                    if (files_iterator != files.begin())
+                        files_iterator--;
                 }
             }
 
-- 
cgit 


From 009623823d6036ea22b34b21812758666fb8f7ba Mon Sep 17 00:00:00 2001
From: James Beddek <telans@posteo.de>
Date: Tue, 20 Jun 2023 23:00:13 +1200
Subject: Modrinth: use default icon for non-managed packs

Fixes: #317
Signed-off-by: James Beddek <telans@posteo.de>
---
 launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
index bb8227aa..76f07277 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
@@ -214,7 +214,7 @@ bool ModrinthCreationTask::createInstance()
 
     if (m_instIcon != "default") {
         instance.setIconKey(m_instIcon);
-    } else {
+    } else if (!m_managed_id.isEmpty()) {
         instance.setIconKey("modrinth");
     }
 
-- 
cgit