mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-10 17:01:24 +12:00
Fix conflicts.
This commit is contained in:
parent
c09b0f511e
commit
9816ec3aa0
35 changed files with 99 additions and 103 deletions
|
@ -90,7 +90,7 @@ int cellSyncMutexLock(mem_ptr_t<CellSyncMutex> mutex)
|
|||
|
||||
while (old_order != mutex->m_freed)
|
||||
{
|
||||
Sleep(1);
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(1));
|
||||
if (Emu.IsStopped())
|
||||
{
|
||||
LOG_WARNING(HLE, "cellSyncMutexLock(mutex=0x%x) aborted", mutex.GetAddr());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue