From ee0e7f15c1e988d75ba4a6621820b576365be4a7 Mon Sep 17 00:00:00 2001 From: Silent Date: Fri, 11 Jun 2021 00:33:12 +0200 Subject: [PATCH] Fix a crash when shutting down emulation from the Hardcore mode confirmation prompt --- src/frontend-common/fullscreen_ui.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp index 7ad0abd42..31aeef719 100644 --- a/src/frontend-common/fullscreen_ui.cpp +++ b/src/frontend-common/fullscreen_ui.cpp @@ -1203,6 +1203,7 @@ static bool ConfirmChallengeModeEnable() if (!s_host_interface->ConfirmMessage(message)) return false; + SaveAndApplySettings(); s_host_interface->PowerOffSystem(s_host_interface->ShouldSaveResumeState()); return true; } @@ -2266,8 +2267,6 @@ void DrawSettingsWindow() s_host_interface->RunLater([]() { if (!ConfirmChallengeModeEnable()) s_host_interface->GetSettingsInterface()->SetBoolValue("Cheevos", "Enabled", false); - else - SaveAndApplySettings(); }); } @@ -2293,8 +2292,6 @@ void DrawSettingsWindow() s_host_interface->RunLater([]() { if (!ConfirmChallengeModeEnable()) s_host_interface->GetSettingsInterface()->SetBoolValue("Cheevos", "ChallengeMode", false); - else - SaveAndApplySettings(); }); }