diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-18 21:49:36 +0200 |
---|---|---|
committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-21 16:56:55 +0200 |
commit | 32116231924bfc1ad356fc0f39df327a393b8df1 (patch) | |
tree | 61ffe216c4246ee63f387169cc2eecb0dc80e216 | |
parent | settings_setting: Fix typo (diff) | |
download | yuzu-32116231924bfc1ad356fc0f39df327a393b8df1.tar yuzu-32116231924bfc1ad356fc0f39df327a393b8df1.tar.gz yuzu-32116231924bfc1ad356fc0f39df327a393b8df1.tar.bz2 yuzu-32116231924bfc1ad356fc0f39df327a393b8df1.tar.lz yuzu-32116231924bfc1ad356fc0f39df327a393b8df1.tar.xz yuzu-32116231924bfc1ad356fc0f39df327a393b8df1.tar.zst yuzu-32116231924bfc1ad356fc0f39df327a393b8df1.zip |
-rw-r--r-- | src/common/settings.cpp | 10 | ||||
-rw-r--r-- | src/common/settings.h | 3 | ||||
-rw-r--r-- | src/common/settings_common.cpp | 10 | ||||
-rw-r--r-- | src/common/settings_common.h | 3 | ||||
-rw-r--r-- | src/yuzu/configuration/shared_widget.cpp | 1 |
5 files changed, 14 insertions, 13 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 59d24a053..4c1cd1cac 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -287,4 +287,14 @@ void RestoreGlobalState(bool is_powered_on) { } } +static bool configuring_global = true; + +bool IsConfiguringGlobal() { + return configuring_global; +} + +void SetConfiguringGlobal(bool is_global) { + configuring_global = is_global; +} + } // namespace Settings diff --git a/src/common/settings.h b/src/common/settings.h index 618c34334..655f6468a 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -529,4 +529,7 @@ void UpdateRescalingInfo(); // Restore the global state of all applicable settings in the Values struct void RestoreGlobalState(bool is_powered_on); +bool IsConfiguringGlobal(); +void SetConfiguringGlobal(bool is_global); + } // namespace Settings diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp index 8b666f8b2..1439fb451 100644 --- a/src/common/settings_common.cpp +++ b/src/common/settings_common.cpp @@ -52,14 +52,4 @@ const std::string& BasicSetting::GetLabel() const { return label; } -static bool configuring_global = true; - -bool IsConfiguringGlobal() { - return configuring_global; -} - -void SetConfiguringGlobal(bool is_global) { - configuring_global = is_global; -} - } // namespace Settings diff --git a/src/common/settings_common.h b/src/common/settings_common.h index ca218e37b..a7630a97f 100644 --- a/src/common/settings_common.h +++ b/src/common/settings_common.h @@ -60,9 +60,6 @@ enum Specialization : u8 { Percentage = (1 << SpecializationAttributeOffset), }; -bool IsConfiguringGlobal(); -void SetConfiguringGlobal(bool is_global); - class BasicSetting; class Linkage { diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp index ba7f60c2d..c9ab461f6 100644 --- a/src/yuzu/configuration/shared_widget.cpp +++ b/src/yuzu/configuration/shared_widget.cpp @@ -39,6 +39,7 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/logging/log.h" +#include "common/settings.h" #include "common/settings_common.h" #include "yuzu/configuration/shared_translation.h" |