mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-08 07:51:28 +12:00
Fix conflicts.
This commit is contained in:
parent
c09b0f511e
commit
9816ec3aa0
35 changed files with 99 additions and 103 deletions
|
@ -2,9 +2,9 @@
|
|||
#include "Utilities/Log.h"
|
||||
#include "Emu/Memory/Memory.h"
|
||||
#include "Emu/System.h"
|
||||
#include "Emu/Cell/PPUThread.h"
|
||||
#include "Emu/SysCalls/SC_FUNC.h"
|
||||
#include "Emu/SysCalls/Modules.h"
|
||||
#include "Emu/DbgCommand.h"
|
||||
#include "Emu/FS/vfsFile.h"
|
||||
#include "Emu/Audio/sysutil_audio.h"
|
||||
|
||||
|
@ -345,7 +345,7 @@ int cellSysutilCheckCallback()
|
|||
|
||||
while (thr.IsAlive())
|
||||
{
|
||||
Sleep(1);
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(1));
|
||||
if (Emu.IsStopped())
|
||||
{
|
||||
LOG_WARNING(HLE, "cellSysutilCheckCallback() aborted");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue