diff options
Diffstat (limited to 'src/frontend_common/config.cpp')
| -rw-r--r-- | src/frontend_common/config.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp index 51576b4ee..9eb4799a6 100644 --- a/src/frontend_common/config.cpp +++ b/src/frontend_common/config.cpp | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include "config.h" | 11 | #include "config.h" |
| 12 | #include "core/core.h" | 12 | #include "core/core.h" |
| 13 | #include "core/hle/service/acc/profile_manager.h" | 13 | #include "core/hle/service/acc/profile_manager.h" |
| 14 | #include "core/hle/service/hid/controllers/npad.h" | 14 | #include "hid_core/resources/npad/npad.h" |
| 15 | #include "network/network.h" | 15 | #include "network/network.h" |
| 16 | 16 | ||
| 17 | #include <boost/algorithm/string/replace.hpp> | 17 | #include <boost/algorithm/string/replace.hpp> |
| @@ -762,17 +762,6 @@ void Config::WriteBooleanSetting(const std::string& key, const bool& value, | |||
| 762 | WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global); | 762 | WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global); |
| 763 | } | 763 | } |
| 764 | 764 | ||
| 765 | template <typename T> | ||
| 766 | std::enable_if_t<std::is_integral_v<T>> Config::WriteIntegerSetting( | ||
| 767 | const std::string& key, const T& value, const std::optional<T>& default_value, | ||
| 768 | const std::optional<bool>& use_global) { | ||
| 769 | std::optional<std::string> string_default = std::nullopt; | ||
| 770 | if (default_value.has_value()) { | ||
| 771 | string_default = std::make_optional(ToString(default_value.value())); | ||
| 772 | } | ||
| 773 | WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global); | ||
| 774 | } | ||
| 775 | |||
| 776 | void Config::WriteDoubleSetting(const std::string& key, const double& value, | 765 | void Config::WriteDoubleSetting(const std::string& key, const double& value, |
| 777 | const std::optional<double>& default_value, | 766 | const std::optional<double>& default_value, |
| 778 | const std::optional<bool>& use_global) { | 767 | const std::optional<bool>& use_global) { |
| @@ -894,9 +883,10 @@ void Config::WriteSettingGeneric(const Settings::BasicSetting* const setting) { | |||
| 894 | WriteBooleanSetting(std::string(key).append("\\use_global"), setting->UsingGlobal()); | 883 | WriteBooleanSetting(std::string(key).append("\\use_global"), setting->UsingGlobal()); |
| 895 | } | 884 | } |
| 896 | if (global || !setting->UsingGlobal()) { | 885 | if (global || !setting->UsingGlobal()) { |
| 886 | auto value = global ? setting->ToStringGlobal() : setting->ToString(); | ||
| 897 | WriteBooleanSetting(std::string(key).append("\\default"), | 887 | WriteBooleanSetting(std::string(key).append("\\default"), |
| 898 | setting->ToString() == setting->DefaultToString()); | 888 | value == setting->DefaultToString()); |
| 899 | WriteStringSetting(key, setting->ToString()); | 889 | WriteStringSetting(key, value); |
| 900 | } | 890 | } |
| 901 | } else if (global) { | 891 | } else if (global) { |
| 902 | WriteBooleanSetting(std::string(key).append("\\default"), | 892 | WriteBooleanSetting(std::string(key).append("\\default"), |