From afe8384b6d4677f6b444bde1f2b75c07f376ac0e Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Mon, 27 Nov 2023 00:45:00 +1000
Subject: [PATCH] System: Use Async HC mode disable for resuming

---
 src/core/system.cpp | 34 ++++++++++++++++++++++++++++------
 src/core/system.h   |  1 +
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/core/system.cpp b/src/core/system.cpp
index 36dffe258..63d119b45 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -1355,13 +1355,35 @@ bool System::BootSystem(SystemBootParameters parameters)
   }
 
   // Check for resuming with hardcore mode.
-  if (!parameters.save_state.empty() && Achievements::IsHardcoreModeActive() &&
-      !Achievements::ConfirmHardcoreModeDisable(TRANSLATE("Achievements", "Resuming state")))
+  if (parameters.disable_achievements_hardcore_mode)
+    Achievements::DisableHardcoreMode();
+  if (!parameters.save_state.empty() && Achievements::IsHardcoreModeActive())
   {
-    s_state = State::Shutdown;
-    ClearRunningGame();
-    Host::OnSystemDestroyed();
-    return false;
+    bool cancelled;
+    if (FullscreenUI::IsInitialized())
+    {
+      Achievements::ConfirmHardcoreModeDisableAsync(TRANSLATE("Achievements", "Resuming state"),
+                                                    [parameters = std::move(parameters)](bool approved) mutable {
+                                                      if (approved)
+                                                      {
+                                                        parameters.disable_achievements_hardcore_mode = true;
+                                                        BootSystem(std::move(parameters));
+                                                      }
+                                                    });
+      cancelled = true;
+    }
+    else
+    {
+      cancelled = !Achievements::ConfirmHardcoreModeDisable(TRANSLATE("Achievements", "Resuming state"));
+    }
+
+    if (cancelled)
+    {
+      s_state = State::Shutdown;
+      ClearRunningGame();
+      Host::OnSystemDestroyed();
+      return false;
+    }
   }
 
   // Load BIOS image.
diff --git a/src/core/system.h b/src/core/system.h
index 077b1df77..39f5ee39f 100644
--- a/src/core/system.h
+++ b/src/core/system.h
@@ -50,6 +50,7 @@ struct SystemBootParameters
   bool load_image_to_ram = false;
   bool force_software_renderer = false;
   bool fast_forward_to_first_frame = false;
+  bool disable_achievements_hardcore_mode = false;
 };
 
 struct SaveStateInfo