archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 02:38:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed conflicts

Browse source
This commit is contained in:
Nekotekina 2014-02-16 21:57:36 +04:00
commit 931929a82c
62 changed files with 1682 additions and 704 deletions
Download patch file Download diff file Expand all files Collapse all files

18
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() || IsPaused())
if(TestDestroy())
{
return CPUThread_Break;
}
if(m_is_step)
{
return CPUThread_Step;
}
if (Emu.IsPaused() || Sync())
{
return CPUThread_Sleeping;
@ -284,8 +284,10 @@ void CPUThread::ExecOnce()
#ifndef QT_UI
wxGetApp().SendDbgCommand(DID_EXEC_THREAD, this);
#endif
m_status = Running;
ThreadBase::Start();
ThreadBase::Stop();
ThreadBase::Stop(true,false);
m_status = Paused;
#ifndef QT_UI
wxGetApp().SendDbgCommand(DID_PAUSE_THREAD, this);
wxGetApp().SendDbgCommand(DID_PAUSED_THREAD, this);