summaryrefslogtreecommitdiff
path: root/src/common/settings_setting.h
diff options
context:
space:
mode:
authorlat9nq <22451773+lat9nq@users.noreply.github.com>2023-06-11 00:41:14 -0400
committerlat9nq <22451773+lat9nq@users.noreply.github.com>2023-07-21 10:56:54 -0400
commit4903f40efe7b0c193309708ea01bd6abea8bac16 (patch)
treebccec5f349aefe70fd30b5e328162c4776dca4d5 /src/common/settings_setting.h
parent04d4b6ab802a1238eaca6c0a16d1a739503b81d9 (diff)
settings_setting: Fix errors
ToString didn't have a constexpr if statement where needed. Canonicalize missed an else, causing unreachable code error on MSVC.
Diffstat (limited to 'src/common/settings_setting.h')
-rw-r--r--src/common/settings_setting.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index f226e38d4..99a4bad01 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -142,7 +142,7 @@ protected:
return value_.has_value() ? std::to_string(*value_) : "none";
} else if constexpr (std::is_same<Type, bool>()) {
return value_ ? "true" : "false";
- } else if (std::is_same<Type, AudioEngine>()) {
+ } else if constexpr (std::is_same<Type, AudioEngine>()) {
return CanonicalizeEnum(value_);
} else {
return std::to_string(static_cast<u64>(value_));
@@ -222,8 +222,9 @@ public:
[[nodiscard]] std::string constexpr Canonicalize() const override {
if constexpr (std::is_enum<Type>::value) {
return CanonicalizeEnum(this->GetValue());
+ } else {
+ return ToString(this->GetValue());
}
- return ToString(this->GetValue());
}
/**