From 396e7d994a546831cac42946f8d2de329db01777 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 22 Oct 2024 01:11:31 +1000 Subject: [PATCH] System: Make global safe mode always take precedence --- src/core/system.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/system.cpp b/src/core/system.cpp index 37c527496..6d7cffe2c 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1352,6 +1352,11 @@ void System::LoadSettings(bool display_osd_messages) g_settings.Load(si, controller_si); g_settings.UpdateLogSettings(); + // Global safe mode overrides game settings. + g_settings.disable_all_enhancements = + (g_settings.disable_all_enhancements || + Host::Internal::GetBaseSettingsLayer()->GetBoolValue("Main", "DisableAllEnhancements", false)); + Host::LoadSettings(si, lock); InputManager::ReloadSources(controller_si, lock); InputManager::ReloadBindings(controller_si, hotkey_si);