Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash

2023-06-23 14:38:30 +03:00
parent 67db141203 8df5ab8aa7
commit 85bbab0e92
47 changed files with 1214 additions and 157 deletions
--- 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");
    }