diff options
| author | t895 <clombardo169@gmail.com> | 2023-12-11 02:10:36 +0100 |
|---|---|---|
| committer | t895 <clombardo169@gmail.com> | 2023-12-12 23:25:36 +0100 |
| commit | 70c3d36536ad98a5569d51f1d0f68a6f01890f11 (patch) | |
| tree | 19fa4ccec7477ca8b963885633004d76aaa00a52 /src/common | |
| parent | Merge pull request #12342 from FearlessTobi/fix-msvc (diff) | |
| download | yuzu-70c3d36536ad98a5569d51f1d0f68a6f01890f11.tar yuzu-70c3d36536ad98a5569d51f1d0f68a6f01890f11.tar.gz yuzu-70c3d36536ad98a5569d51f1d0f68a6f01890f11.tar.bz2 yuzu-70c3d36536ad98a5569d51f1d0f68a6f01890f11.tar.lz yuzu-70c3d36536ad98a5569d51f1d0f68a6f01890f11.tar.xz yuzu-70c3d36536ad98a5569d51f1d0f68a6f01890f11.tar.zst yuzu-70c3d36536ad98a5569d51f1d0f68a6f01890f11.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings_setting.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h index 3175ab07d..0b18ca5ec 100644 --- a/src/common/settings_setting.h +++ b/src/common/settings_setting.h @@ -81,6 +81,9 @@ public: [[nodiscard]] virtual const Type& GetValue() const { return value; } + [[nodiscard]] virtual const Type& GetValue(bool need_global) const { + return value; + } /** * Sets the setting to the given value. @@ -353,7 +356,7 @@ public: } return custom; } - [[nodiscard]] const Type& GetValue(bool need_global) const { + [[nodiscard]] const Type& GetValue(bool need_global) const override final { if (use_global || need_global) { return this->value; } |