diff options
Diffstat (limited to 'Source/Core/UICommon/ResourcePack/ResourcePack.cpp')
| -rw-r--r-- | Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp index 92282626d5..225714c1f4 100644 --- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp +++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp @@ -265,8 +265,9 @@ bool ResourcePack::Uninstall(const std::string& path) // Check if a higher priority pack already provides a given texture, don't delete it for (const auto& pack : GetHigherPriorityPacks(*this)) { - if (std::find(pack->GetTextures().begin(), pack->GetTextures().end(), texture) != - pack->GetTextures().end()) + if (::ResourcePack::IsInstalled(*pack) && + std::find(pack->GetTextures().begin(), pack->GetTextures().end(), texture) != + pack->GetTextures().end()) { provided_by_other_pack = true; break; @@ -279,8 +280,9 @@ bool ResourcePack::Uninstall(const std::string& path) // Check if a lower priority pack provides a given texture - if so, install it. for (auto& pack : lower) { - if (std::find(pack->GetTextures().rbegin(), pack->GetTextures().rend(), texture) != - pack->GetTextures().rend()) + if (::ResourcePack::IsInstalled(*pack) && + std::find(pack->GetTextures().rbegin(), pack->GetTextures().rend(), texture) != + pack->GetTextures().rend()) { pack->Install(path); |