From 440a1700c0b37fcdeb274602f42518260137ac12 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 10 Apr 2024 20:02:21 +1000
Subject: [PATCH] System: Interrupt execution when loading state and reset

---
 src/core/system.cpp       | 12 ++++++++----
 src/util/d3d11_device.cpp |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/core/system.cpp b/src/core/system.cpp
index 992227185..26977fbe3 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -1115,7 +1115,8 @@ void System::ResetSystem()
   InternalReset();
   ResetPerformanceCounters();
   ResetThrottler();
-  Host::AddOSDMessage(TRANSLATE_STR("OSDMessage", "System reset."));
+  Host::AddIconOSDMessage("system_reset", ICON_FA_POWER_OFF, TRANSLATE_STR("OSDMessage", "System reset."),
+                          Host::OSD_QUICK_DURATION);
 }
 
 void System::PauseSystem(bool paused)
@@ -2232,6 +2233,7 @@ void System::InternalReset()
   s_frame_number = 1;
   s_internal_frame_number = 0;
   TimingEvents::Reset();
+  InterruptExecution();
   ResetPerformanceCounters();
 
   Achievements::ResetClient();
@@ -2407,6 +2409,7 @@ bool System::LoadStateFromStream(ByteStream* state, bool update_display, bool ig
   if (s_state == State::Starting)
     s_state = State::Running;
 
+  InterruptExecution();
   ResetPerformanceCounters();
   ResetThrottler();
   return true;
@@ -4560,13 +4563,14 @@ bool System::LoadCheatList()
 
   if (cl->GetEnabledCodeCount() > 0)
   {
-    Host::AddOSDMessage(
+    Host::AddIconOSDMessage(
+      "cheats_loaded", ICON_FA_EXCLAMATION_TRIANGLE,
       fmt::format(TRANSLATE_FS("OSDMessage", "{} cheats are enabled. This may result in instability."),
                   cl->GetEnabledCodeCount()),
-      30.0f);
+      Host::OSD_WARNING_DURATION);
   }
 
-  System::SetCheatList(std::move(cl));
+  SetCheatList(std::move(cl));
   return true;
 }
 
diff --git a/src/util/d3d11_device.cpp b/src/util/d3d11_device.cpp
index 1b24fecc5..a3c639b4e 100644
--- a/src/util/d3d11_device.cpp
+++ b/src/util/d3d11_device.cpp
@@ -611,7 +611,7 @@ bool D3D11Device::BeginPresent(bool skip_present)
   if (!m_swap_chain)
   {
     // Note: Really slow on Intel...
-    m_context->Flush();
+    //m_context->Flush();
     TrimTexturePool();
     return false;
   }