archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-16 11:48:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

undo thread behavior changes and add html subproject to dependencies.

Browse source
This commit is contained in:
Peter Tissen 2014-02-14 18:14:14 +01:00
parent 209155d71d
commit 8bf8c7e6e9
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/CPU/CPUThread.cpp
View file

@ -96,21 +96,21 @@ bool CPUThread::Sync()
int CPUThread::ThreadStatus()
{
if(Emu.IsStopped() || IsStopped() )
if(Emu.IsStopped() || IsStopped() || IsPaused())
{
return CPUThread_Stopped;
}
if (m_is_step)
{
return CPUThread_Step;
}
if (TestDestroy())
if(TestDestroy())
{
return CPUThread_Break;
}
if(m_is_step)
{
return CPUThread_Step;
}
if(Emu.IsPaused() || Sync())
{
return CPUThread_Sleeping;