From 13ea2c77ff0848990fbc4a916c04f94610bcb359 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sat, 29 Mar 2025 12:28:09 -0700 Subject: [PATCH] Revert "Core: Only unlock CPU thread if CPUThreadGuard locked it" This reverts commit 522470274dc233dfd876894b86b27ab673e3d0a6. --- Source/Core/Core/Core.cpp | 6 +++--- Source/Core/Core/Core.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index a3069604a5..5f90f93bae 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -1050,15 +1050,15 @@ void UpdateInputGate(bool require_focus, bool require_full_focus) } CPUThreadGuard::CPUThreadGuard(Core::System& system) - : m_system(system), m_was_cpu_thread(IsCPUThread()), m_has_cpu_thread(IsRunningAndStarted()) + : m_system(system), m_was_cpu_thread(IsCPUThread()) { - if (m_has_cpu_thread && !m_was_cpu_thread) + if (!m_was_cpu_thread) m_was_unpaused = PauseAndLock(system, true, true); } CPUThreadGuard::~CPUThreadGuard() { - if (m_has_cpu_thread && !m_was_cpu_thread) + if (!m_was_cpu_thread) PauseAndLock(m_system, false, m_was_unpaused); } diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h index 99424ffb6e..eca18cf3be 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -114,7 +114,6 @@ public: private: Core::System& m_system; const bool m_was_cpu_thread; - const bool m_has_cpu_thread; bool m_was_unpaused = false; };