From 08c45684de41598a7e179c3e7da16304797f0111 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Sat, 20 Dec 2025 23:54:31 +0200 Subject: [PATCH] match disabled mods on uninstall fixes #4537 This ensures that when looking to uninstall a resource prism will consider the disabled ones to. Right now we have a guard in place to prevent resources using the same name so this check will allways match with the correct resouce. Signed-off-by: Trial97 --- launcher/minecraft/mod/ResourceFolderModel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp index 785d3f7e5..4083a7088 100644 --- a/launcher/minecraft/mod/ResourceFolderModel.cpp +++ b/launcher/minecraft/mod/ResourceFolderModel.cpp @@ -207,7 +207,13 @@ void ResourceFolderModel::installResourceWithFlameMetadata(QString path, ModPlat bool ResourceFolderModel::uninstallResource(const QString& file_name, bool preserve_metadata) { for (auto& resource : m_resources) { - if (resource->fileinfo().fileName() == file_name) { + auto resourceFileInfo = resource->fileinfo(); + auto resourceFileName = resource->fileinfo().fileName(); + if (!resource->enabled() && resourceFileName.endsWith(".disabled")) { + resourceFileName.chop(9); + } + + if (resourceFileName == file_name) { auto res = resource->destroy(indexDir(), preserve_metadata, false); update();