RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +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

4
rpcs3/Emu/SysCalls/Callback.cpp
View file

@ -69,7 +69,7 @@ again:
LOG_WARNING(HLE, "Callback::Branch() aborted");
return 0;
}
Sleep(1);
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
std::lock_guard<std::mutex> lock(cb_mutex);
@ -112,7 +112,7 @@ again:
LOG_WARNING(HLE, "Callback::Branch(true) aborted (end)");
return 0;
}
Sleep(1);
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
return thr.GetExitStatus();