Skip to content

Commit

Permalink
Merge pull request #11864 from iwubcode/graphics_mod_action_check
Browse files Browse the repository at this point in the history
VideoCommon: check for successful graphics mod action creation before adding targets
  • Loading branch information
AdmiralCurtiss committed May 30, 2023
2 parents 356792c + 0afb8c2 commit d847c36
Showing 1 changed file with 13 additions and 8 deletions.
Expand Up @@ -255,34 +255,39 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config)
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));
if (action == nullptr)
{
WARN_LOG_FMT(VIDEO, "Failed to create action '{}' for group '{}'.", feature.m_action,
feature.m_group);
return;
return false;
}
m_actions.push_back(std::move(action));
return true;
};

// Prefer groups in the pack over groups from another pack
if (const auto local_it = group_to_targets.find(internal_group);
local_it != group_to_targets.end())
{
add_action(mod);
for (const GraphicsTargetConfig& target : local_it->second)
if (add_action(mod))
{
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);
global_it != group_to_targets.end())
{
add_action(mod);
for (const GraphicsTargetConfig& target : global_it->second)
if (add_action(mod))
{
add_target(target);
for (const GraphicsTargetConfig& target : global_it->second)
{
add_target(target);
}
}
}
else
Expand Down

0 comments on commit d847c36

Please sign in to comment.