From 57cf0f2643e5cbde83395bcc7cf52ff31ae8bc8f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 19 Oct 2024 01:11:46 +1000 Subject: [PATCH] System: Reload cheats/patches on safe mode toggle --- src/core/system.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index aa97c2680..f513fc465 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1470,9 +1470,14 @@ void System::ApplySettings(bool display_osd_messages) LoadSettings(display_osd_messages); // If we've disabled/enabled game settings, we need to reload without it. - if (g_settings.apply_game_settings != old_config.apply_game_settings) + // Also reload cheats when safe mode is toggled, because patches might change. + if (g_settings.apply_game_settings != old_config.apply_game_settings || + g_settings.disable_all_enhancements != old_config.disable_all_enhancements) { - UpdateGameSettingsLayer(); + if (g_settings.apply_game_settings != old_config.apply_game_settings) + UpdateGameSettingsLayer(); + else + Cheats::ReloadCheats(false, true, false, true); LoadSettings(display_osd_messages); }