summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorjoewestcott <joe.westcott@me.com>2015-05-06 05:36:37 +0100
committerjoewestcott <joe.westcott@me.com>2015-05-06 05:36:37 +0100
commit72956d59c8a6c81b994f80c3cd14b58d7ea268c8 (patch)
tree4bb17a70511d8851728b58cc1993124986e4bfb9 /Source
parenta7e2425ffbc1e8cde8426c039a26941635d6b856 (diff)
Reverts pull request #2362, fixes issue 8542.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/HW/CPU.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
index ff3c39d572..f583cc3dfe 100644
--- a/Source/Core/Core/HW/CPU.cpp
+++ b/Source/Core/Core/HW/CPU.cpp
@@ -150,9 +150,9 @@ bool CCPU::PauseAndLock(bool doLock, bool unpauseOnUnlock)
if (doLock)
{
// we can't use EnableStepping, that would causes deadlocks with both audio and video
+ PowerPC::Pause();
if (!Core::IsCPUThread())
m_csCpuOccupied.lock();
- PowerPC::Pause();
}
else
{