mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-07 15:31:26 +12:00
Fix conflicts.
This commit is contained in:
parent
c09b0f511e
commit
9816ec3aa0
35 changed files with 99 additions and 103 deletions
|
@ -177,7 +177,7 @@ private:
|
|||
Step();
|
||||
}
|
||||
|
||||
while(!TestDestroy()) Sleep(0);
|
||||
while(!TestDestroy()) std::this_thread::sleep_for(std::chrono::milliseconds(0));
|
||||
if(m_destroy_sem.TryWait() != wxSEMA_NO_ERROR) m_destroy_sem.Post();
|
||||
}
|
||||
|
||||
|
@ -198,7 +198,7 @@ public:
|
|||
{
|
||||
if(!IsRunning()) return;
|
||||
|
||||
while(m_main_sem.TryWait() != wxSEMA_NO_ERROR) Sleep(0);
|
||||
while(m_main_sem.TryWait() != wxSEMA_NO_ERROR) std::this_thread::sleep_for(std::chrono::milliseconds(0));
|
||||
}
|
||||
|
||||
void Exit(bool wait = false)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue