ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: check whether action was successfully created before adding targets for a graphics mod

This commit is contained in:
iwubcode 2023-05-30 09:32:59 -05:00
parent 356792cc20
commit 0afb8c247f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
View File

@ -255,34 +255,39 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config)
target); target);
}; };
const auto add_action = [&](GraphicsModConfig mod_config) { const auto add_action = [&](GraphicsModConfig mod_config) -> bool {
auto action = create_action(feature.m_action, feature.m_action_data, std::move(mod_config)); auto action = create_action(feature.m_action, feature.m_action_data, std::move(mod_config));
if (action == nullptr) if (action == nullptr)
{ {
WARN_LOG_FMT(VIDEO, "Failed to create action '{}' for group '{}'.", feature.m_action, WARN_LOG_FMT(VIDEO, "Failed to create action '{}' for group '{}'.", feature.m_action,
feature.m_group); feature.m_group);
return; return false;
} }
m_actions.push_back(std::move(action)); m_actions.push_back(std::move(action));
return true;
}; };
// Prefer groups in the pack over groups from another pack // Prefer groups in the pack over groups from another pack
if (const auto local_it = group_to_targets.find(internal_group); if (const auto local_it = group_to_targets.find(internal_group);
local_it != group_to_targets.end()) local_it != group_to_targets.end())
{ {
add_action(mod); if (add_action(mod))
for (const GraphicsTargetConfig& target : local_it->second)
{ {
add_target(target); for (const GraphicsTargetConfig& target : local_it->second)
{
add_target(target);
}
} }
} }
else if (const auto global_it = group_to_targets.find(feature.m_group); else if (const auto global_it = group_to_targets.find(feature.m_group);
global_it != group_to_targets.end()) global_it != group_to_targets.end())
{ {
add_action(mod); if (add_action(mod))
for (const GraphicsTargetConfig& target : global_it->second)
{ {
add_target(target); for (const GraphicsTargetConfig& target : global_it->second)
{
add_target(target);
}
} }
} }
else else