diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-16 19:57:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-16 19:57:54 +0100 |
| commit | 00965e6c3433794c3654fccb119edcf9d6bcca99 (patch) | |
| tree | 4b07c0caee8a9a45f18c0f1ec6036e71a3915682 /src/common/settings_setting.h | |
| parent | Merge pull request #12331 from liamwhite/layer-confusion (diff) | |
| parent | android: Rework InstallableProperty view with icon (diff) | |
| download | yuzu-00965e6c3433794c3654fccb119edcf9d6bcca99.tar yuzu-00965e6c3433794c3654fccb119edcf9d6bcca99.tar.gz yuzu-00965e6c3433794c3654fccb119edcf9d6bcca99.tar.bz2 yuzu-00965e6c3433794c3654fccb119edcf9d6bcca99.tar.lz yuzu-00965e6c3433794c3654fccb119edcf9d6bcca99.tar.xz yuzu-00965e6c3433794c3654fccb119edcf9d6bcca99.tar.zst yuzu-00965e6c3433794c3654fccb119edcf9d6bcca99.zip | |
Diffstat (limited to 'src/common/settings_setting.h')
| -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; } |