ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2362 from jdieter/master 

Avoid deadlock when adding Wiimotes
This commit is contained in:
skidau 2015-05-06 12:30:54 +10:00
parent 571cdcddd8 4112794d4a
commit 41f168373b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/CPU.cpp
View File

@ -150,9 +150,9 @@ bool CCPU::PauseAndLock(bool doLock, bool unpauseOnUnlock)
if (doLock) if (doLock)
{ {
// we can't use EnableStepping, that would causes deadlocks with both audio and video // we can't use EnableStepping, that would causes deadlocks with both audio and video
PowerPC::Pause();
if (!Core::IsCPUThread()) if (!Core::IsCPUThread())
m_csCpuOccupied.lock(); m_csCpuOccupied.lock();
PowerPC::Pause();
} }
else else
{ {