mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76 from Bigpet/master

Browse Source 
Fix stepping a little better than last time
This commit is contained in:
Alexandro Sánchez Bach 2014-02-14 21:09:24 +01:00
commit f2a3db0bd8
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Utilities/Thread.cpp
View File

@ -52,11 +52,12 @@ void ThreadBase::Start()
}); });
} }
void ThreadBase::Stop(bool wait) void ThreadBase::Stop(bool wait, bool send_destroy)
{ {
std::lock_guard<std::mutex> lock(m_main_mutex); std::lock_guard<std::mutex> lock(m_main_mutex);
m_destroy = true; if (send_destroy)
m_destroy = true;
if(!m_executor) if(!m_executor)
return; return;

2
Utilities/Thread.h
View File

@ -41,7 +41,7 @@ protected:
public: public:
void Start(); void Start();
void Stop(bool wait = true); void Stop(bool wait = true, bool send_destroy = true);
bool Join() const; bool Join() const;
bool IsAlive() const; bool IsAlive() const;

4
rpcs3/Emu/CPU/CPUThread.cpp
View File

@ -284,8 +284,10 @@ void CPUThread::ExecOnce()
#ifndef QT_UI #ifndef QT_UI
wxGetApp().SendDbgCommand(DID_EXEC_THREAD, this); wxGetApp().SendDbgCommand(DID_EXEC_THREAD, this);
#endif #endif
m_status = Running;
ThreadBase::Start(); ThreadBase::Start();
ThreadBase::Stop(); ThreadBase::Stop(true,false);
m_status = Paused;
#ifndef QT_UI #ifndef QT_UI
wxGetApp().SendDbgCommand(DID_PAUSE_THREAD, this); wxGetApp().SendDbgCommand(DID_PAUSE_THREAD, this);
wxGetApp().SendDbgCommand(DID_PAUSED_THREAD, this); wxGetApp().SendDbgCommand(DID_PAUSED_THREAD, this);