From 4a707afae1109e69e8ea8d982d1c52ac78caf014 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 17 May 2025 18:44:02 +1000 Subject: [PATCH] System: Show safe mode warning after applying gamesettings Prevents warning about things that have already been disabled. --- src/core/system.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index 8fbc21ad6..155787c4c 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1222,14 +1222,14 @@ void System::LoadSettings(bool display_osd_messages) InputManager::ReloadSources(controller_si, lock); InputManager::ReloadBindings(controller_si, hotkey_si); - // show safe mode warning if it's toggled on, or on startup - if (IsValidOrInitializing() && (display_osd_messages || (!previous_safe_mode && g_settings.disable_all_enhancements))) - WarnAboutUnsafeSettings(); - // apply compatibility settings if (g_settings.apply_compatibility_settings && s_state.running_game_entry) s_state.running_game_entry->ApplySettings(g_settings, display_osd_messages); + // show safe mode warning if it's toggled on, or on startup + if (IsValidOrInitializing() && (display_osd_messages || (!previous_safe_mode && g_settings.disable_all_enhancements))) + WarnAboutUnsafeSettings(); + // patch overrides take precedence over compat settings Cheats::ApplySettingOverrides();