diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-05-03 10:52:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 10:52:45 -0400 |
| commit | 627022bef9065d6c02a9782b0c6336c72f4f1e61 (patch) | |
| tree | 286588730ae66197756c34b0ab0cdbebc52e46ef /src/common | |
| parent | 8f43b05d6b1be260f68907c581b8e3a91cf244d8 (diff) | |
| parent | 2cd9e1ecb6b67286ae89ef5758a389b58673c378 (diff) | |
Merge pull request #10124 from liamwhite/pebkac
settings: rename extended memory layout to unsafe, move from general to system
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.cpp | 3 | ||||
| -rw-r--r-- | src/common/settings.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 77ff21128..cb1bca467 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -45,6 +45,7 @@ void LogSettings() { log_setting("System_LanguageIndex", values.language_index.GetValue()); log_setting("System_RegionIndex", values.region_index.GetValue()); log_setting("System_TimeZoneIndex", values.time_zone_index.GetValue()); + log_setting("System_UnsafeMemoryLayout", values.use_unsafe_extended_memory_layout.GetValue()); log_setting("Core_UseMultiCore", values.use_multi_core.GetValue()); log_setting("CPU_Accuracy", values.cpu_accuracy.GetValue()); log_setting("Renderer_UseResolutionScaling", values.resolution_setup.GetValue()); @@ -191,7 +192,7 @@ void RestoreGlobalState(bool is_powered_on) { // Core values.use_multi_core.SetGlobal(true); - values.use_extended_memory_layout.SetGlobal(true); + values.use_unsafe_extended_memory_layout.SetGlobal(true); // CPU values.cpu_accuracy.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 5379d0dd5..adebb0ca7 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -388,7 +388,8 @@ struct Values { // Core SwitchableSetting<bool> use_multi_core{true, "use_multi_core"}; - SwitchableSetting<bool> use_extended_memory_layout{false, "use_extended_memory_layout"}; + SwitchableSetting<bool> use_unsafe_extended_memory_layout{false, + "use_unsafe_extended_memory_layout"}; // Cpu SwitchableSetting<CPUAccuracy, true> cpu_accuracy{CPUAccuracy::Auto, CPUAccuracy::Auto, |