InputCommon: Fix ControlGroup::SaveConfig with DefaultValue::Disabled
I also changed LoadConfig, but that change doesn't affect correctness,
it's only so it looks neat by matching SaveConfig.
This bug was added in 18a4afb053
, the
commit that introduced DefaultValue::Disabled. The bug can't actually be
triggered in master, but it can be triggered in the Android input
overhaul PR.
This commit is contained in:
parent
26adf78e45
commit
9b3816c993
|
@ -57,7 +57,7 @@ void ControlGroup::LoadConfig(IniFile::Section* sec, const std::string& defdev,
|
||||||
|
|
||||||
// enabled
|
// enabled
|
||||||
if (default_value != DefaultValue::AlwaysEnabled)
|
if (default_value != DefaultValue::AlwaysEnabled)
|
||||||
sec->Get(group + "Enabled", &enabled, default_value == DefaultValue::Enabled);
|
sec->Get(group + "Enabled", &enabled, default_value != DefaultValue::Disabled);
|
||||||
|
|
||||||
for (auto& setting : numeric_settings)
|
for (auto& setting : numeric_settings)
|
||||||
setting->LoadFromIni(*sec, group);
|
setting->LoadFromIni(*sec, group);
|
||||||
|
@ -109,7 +109,7 @@ void ControlGroup::SaveConfig(IniFile::Section* sec, const std::string& defdev,
|
||||||
const std::string group(base + name + "/");
|
const std::string group(base + name + "/");
|
||||||
|
|
||||||
// enabled
|
// enabled
|
||||||
sec->Set(group + "Enabled", enabled, true);
|
sec->Set(group + "Enabled", enabled, default_value != DefaultValue::Disabled);
|
||||||
|
|
||||||
for (auto& setting : numeric_settings)
|
for (auto& setting : numeric_settings)
|
||||||
setting->SaveToIni(*sec, group);
|
setting->SaveToIni(*sec, group);
|
||||||
|
|
Loading…
Reference in New Issue