VERY experimental Nintendo Switch 2 emulator
C++
common: Move global configuration state modifiers back to settings
lat9nq5c0cf58f73c4
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex 59d24a0534..4c1cd1cacb 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 Settingsdiff --git a/src/common/settings.h b/src/common/settings.hindex 618c34334c..655f6468ab 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 structvoid RestoreGlobalState(bool is_powered_on);+bool IsConfiguringGlobal();+void SetConfiguringGlobal(bool is_global);+} // namespace Settingsdiff --git a/src/common/settings_common.cpp b/src/common/settings_common.cppindex 8b666f8b28..1439fb451a 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 Settingsdiff --git a/src/common/settings_common.h b/src/common/settings_common.hindex ca218e37b8..a7630a97f6 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.cppindex ba7f60c2d8..c9ab461f62 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"