RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-09 08:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts.

Browse source
This commit is contained in:
Sacha 2014-07-12 17:02:39 +10:00
parent c09b0f511e
commit 9816ec3aa0
35 changed files with 99 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/Gui/DisAsmFrame.cpp
View file

@ -220,7 +220,8 @@ struct WaitDumperThread : public ThreadBase
{
for(uint i=0; i<cores; i++)
{
while(done[i] == false) Sleep(1);
while(done[i] == false)
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
LOG_NOTICE(HLE, "Saving dump is started!");