From 88399cf922062657819d5e11c838ae2947b13e3e Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 22 Sep 2025 14:47:56 +0300 Subject: [PATCH] fix: modrinth modpacks icon importing Signed-off-by: Trial97 --- launcher/modplatform/modrinth/ModrinthPackIndex.cpp | 2 +- launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp index 8e0552a48..702a8f309 100644 --- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp +++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp @@ -52,7 +52,7 @@ void Modrinth::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj) pack.description = Json::ensureString(obj, "description", ""); pack.logoUrl = Json::ensureString(obj, "icon_url", ""); - pack.logoName = pack.addonId.toString(); + pack.logoName = QString("%1.%2").arg(Json::ensureString(obj, "slug"), QFileInfo(QUrl(pack.logoUrl).fileName()).suffix()); ModPlatform::ModpackAuthor modAuthor; modAuthor.name = Json::ensureString(obj, "author", QObject::tr("No author(s)")); diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp index 768f2f492..8de263078 100644 --- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp +++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp @@ -320,9 +320,9 @@ void ModrinthPage::suggestCurrent() extra_info.insert("pack_version_id", ver.fileId.toString()); m_dialog->setSuggestedPack(m_current->name, ver.version, new InstanceImportTask(ver.downloadUrl, this, std::move(extra_info))); - auto iconName = m_current->logoName; - m_model->getLogo(iconName, m_current->logoUrl, - [this, iconName](QString logo) { m_dialog->setSuggestedIconFromFile(logo, iconName); }); + QString editedLogoName = "modrinth_" + m_current->logoName; + m_model->getLogo(m_current->logoName, m_current->logoUrl, + [this, editedLogoName](QString logo) { m_dialog->setSuggestedIconFromFile(logo, editedLogoName); }); break; }