H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: Fix function virtualization

Browse Source 
Fixes a theoretical scenario where a Setting is using the BasicSetting's
GetValue function. In practice this probably only happens on yuzu-cmd,
where there is no need for a Setting's additional features. Need to fix
regardless.
This commit is contained in:
lat9nq 2021-07-30 13:33:35 -04:00
parent a1f19b61f8
commit 7737bdfd1a
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/settings.h
View File

@ -81,7 +81,7 @@ public:
* *
* @returns A reference to the setting * @returns A reference to the setting
*/ */
[[nodiscard]] const Type& GetValue() const { [[nodiscard]] virtual const Type& GetValue() const {
return global; return global;
} }
@ -90,7 +90,7 @@ public:
* *
* @param value The desired value * @param value The desired value
*/ */
void SetValue(const Type& value) { virtual void SetValue(const Type& value) {
Type temp{value}; Type temp{value};
std::swap(global, temp); std::swap(global, temp);
} }
@ -120,7 +120,7 @@ public:
* *
* @returns A reference to the setting * @returns A reference to the setting
*/ */
const Type& operator=(const Type& value) { virtual const Type& operator=(const Type& value) {
Type temp{value}; Type temp{value};
std::swap(global, temp); std::swap(global, temp);
return global; return global;
@ -131,7 +131,7 @@ public:
* *
* @returns A reference to the setting * @returns A reference to the setting
*/ */
explicit operator const Type&() const { explicit virtual operator const Type&() const {
return global; return global;
} }
@ -167,7 +167,7 @@ public:
* *
* @param value The desired value * @param value The desired value
*/ */
void SetValue(const Type& value) { void SetValue(const Type& value) override {
Type temp; Type temp;
if (value < minimum) { if (value < minimum) {
temp = std::move(minimum); temp = std::move(minimum);
@ -185,7 +185,7 @@ public:
* @param value The desired value * @param value The desired value
* @returns A reference to the setting's value * @returns A reference to the setting's value
*/ */
const Type& operator=(const Type& value) { const Type& operator=(const Type& value) override {
Type temp; Type temp;
if (value < minimum) { if (value < minimum) {
temp = std::move(minimum); temp = std::move(minimum);
@ -252,7 +252,13 @@ public:
* *
* @returns The required value of the setting * @returns The required value of the setting
*/ */
[[nodiscard]] const Type& GetValue(bool need_global = false) const { [[nodiscard]] const Type& GetValue() const override {
if (use_global) {
return this->global;
}
return custom;
}
[[nodiscard]] const Type& GetValue(bool need_global) const {
if (use_global || need_global) { if (use_global || need_global) {
return this->global; return this->global;
} }
@ -264,7 +270,7 @@ public:
* *
* @param value The new value * @param value The new value
*/ */
void SetValue(const Type& value) { void SetValue(const Type& value) override {
Type temp{value}; Type temp{value};
if (use_global) { if (use_global) {
std::swap(this->global, temp); std::swap(this->global, temp);
@ -280,7 +286,7 @@ public:
* *
* @returns A reference to the current setting value * @returns A reference to the current setting value
*/ */
const Type& operator=(const Type& value) { const Type& operator=(const Type& value) override {
Type temp{value}; Type temp{value};
if (use_global) { if (use_global) {
std::swap(this->global, temp); std::swap(this->global, temp);
@ -295,7 +301,7 @@ public:
* *
* @returns A reference to the current setting value * @returns A reference to the current setting value
*/ */
explicit operator const Type&() const { explicit operator const Type&() const override {
if (use_global) { if (use_global) {
return this->global; return this->global;
} }
@ -335,7 +341,7 @@ public:
* *
* @param value The desired value * @param value The desired value
*/ */
void SetValue(const Type& value) { void SetValue(const Type& value) override {
Type temp; Type temp;
if (value < this->minimum) { if (value < this->minimum) {
temp = std::move(this->minimum); temp = std::move(this->minimum);
@ -358,7 +364,7 @@ public:
* @param value The desired value * @param value The desired value
* @returns A reference to the setting's value * @returns A reference to the setting's value
*/ */
const Type& operator=(const Type& value) { const Type& operator=(const Type& value) override {
Type temp; Type temp;
if (value < this->minimum) { if (value < this->minimum) {
temp = std::move(this->minimum); temp = std::move(this->minimum);