System: Make global safe mode always take precedence

stenzek · Oct 21, 2024 · 396e7d9 · 396e7d9
1 parent bd5a97f
commit 396e7d9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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);