From dc29307a559fe0bf35ab1157e6c4768a82cccf27 Mon Sep 17 00:00:00 2001 From: Adrian <78108584+AdrianCassar@users.noreply.github.com> Date: Tue, 8 Aug 2023 21:09:16 +0100 Subject: [PATCH] [Patcher] Fixed loading of disabled plugins --- src/xenia/patcher/plugin_loader.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/xenia/patcher/plugin_loader.cc b/src/xenia/patcher/plugin_loader.cc index 23a3f2075..6f0d55d63 100644 --- a/src/xenia/patcher/plugin_loader.cc +++ b/src/xenia/patcher/plugin_loader.cc @@ -140,15 +140,15 @@ std::vector PluginLoader::GetHashes( bool PluginLoader::IsAnyPluginForTitleAvailable( const uint32_t title_id, const uint64_t module_hash) const { - const auto result = - std::find_if(plugin_configs_.cbegin(), plugin_configs_.cend(), - [title_id, module_hash](const PluginInfoEntry& entry) { - const auto hash_exists = - std::find(entry.hashes.cbegin(), entry.hashes.cend(), - module_hash) != entry.hashes.cend(); + const auto result = std::find_if( + plugin_configs_.cbegin(), plugin_configs_.cend(), + [title_id, module_hash](const PluginInfoEntry& entry) { + const auto hash_exists = + std::find(entry.hashes.cbegin(), entry.hashes.cend(), + module_hash) != entry.hashes.cend(); - return entry.title_id == title_id && hash_exists; - }); + return entry.is_enabled && entry.title_id == title_id && hash_exists; + }); return result != plugin_configs_.cend(); } @@ -159,7 +159,7 @@ void PluginLoader::LoadTitlePlugins(const uint32_t title_id) { std::copy_if(plugin_configs_.cbegin(), plugin_configs_.cend(), std::back_inserter(title_plugins), [title_id](const PluginInfoEntry& entry) { - return entry.title_id == title_id; + return entry.is_enabled && entry.title_id == title_id; }); if (title_plugins.empty()) {