summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/InputConfig.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2020-11-12 14:41:50 +0100
committerGitHub <noreply@github.com>2020-11-12 14:41:50 +0100
commitc991f004796b0ef62d18ad58802c5fe62c0cf88a (patch)
tree34b9b9fbcd0ca3e999fc15cfad82ed8752275b15 /Source/Core/InputCommon/InputConfig.cpp
parent93212049ac7cecd7a274a97cb5c6c860cd512aa7 (diff)
parentd8e1921b573fb05bebd98a846ee2f6ffa0621b8d (diff)
Merge pull request #9244 from lioncash/input-panic
InputCommon: Migrate over to fmt-capable panic alerts
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
-rw-r--r--Source/Core/InputCommon/InputConfig.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index 501e75d958..b531e56003 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -60,10 +60,12 @@ bool InputConfig::LoadConfig(bool isGC)
for (int i = 0; i < 4; i++)
{
- if (control_section->Exists(type + "Profile" + std::string(num[i])))
+ const auto profile_name = fmt::format("{}Profile{}", type, num[i]);
+
+ if (control_section->Exists(profile_name))
{
std::string profile_setting;
- if (control_section->Get(type + "Profile" + std::string(num[i]), &profile_setting))
+ if (control_section->Get(profile_name, &profile_setting))
{
auto profiles = InputProfile::GetProfilesFromSetting(
profile_setting, File::GetUserPath(D_CONFIG_IDX) + path);
@@ -71,7 +73,7 @@ bool InputConfig::LoadConfig(bool isGC)
if (profiles.empty())
{
// TODO: PanicAlert shouldn't be used for this.
- PanicAlertT("No profiles found for game setting '%s'", profile_setting.c_str());
+ PanicAlertFmtT("No profiles found for game setting '{}'", profile_setting);
continue;
}