mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-03 06:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Core: Only unlock CPU thread if CPUThreadGuard locked it"

Browse source 
This reverts commit 522470274d.
This commit is contained in:
Pokechu22 2025-03-29 12:28:09 -07:00
commit 13ea2c77ff
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Core/Core.cpp
View file

@ -1050,15 +1050,15 @@ void UpdateInputGate(bool require_focus, bool require_full_focus)
} }
CPUThreadGuard::CPUThreadGuard(Core::System& system) 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); m_was_unpaused = PauseAndLock(system, true, true);
} }
CPUThreadGuard::~CPUThreadGuard() CPUThreadGuard::~CPUThreadGuard()
{ {
if (m_has_cpu_thread && !m_was_cpu_thread) if (!m_was_cpu_thread)
PauseAndLock(m_system, false, m_was_unpaused); PauseAndLock(m_system, false, m_was_unpaused);
} }

1
Source/Core/Core/Core.h
View file

@ -114,7 +114,6 @@ public:
private: private:
Core::System& m_system; Core::System& m_system;
const bool m_was_cpu_thread; const bool m_was_cpu_thread;
const bool m_has_cpu_thread;
bool m_was_unpaused = false; bool m_was_unpaused = false;
}; };