From 4112794d4a5dfabd2d1b54cdafd247b8f1995b5d Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Sun, 3 May 2015 18:47:15 +0300 Subject: [PATCH] Avoid deadlock when adding Wiimotes Signed-off-by: Jonathan Dieter --- Source/Core/Core/HW/CPU.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index f583cc3dfe..ff3c39d572 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 {