archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 01:38:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix small merge mistake

Browse source
This commit is contained in:
Bigpet 2014-02-23 18:13:08 +01:00
commit 1be8563fdb
47 changed files with 3065 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
View file

@ -469,6 +469,9 @@ int cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutionId, u32 as
return CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT;
}
extern std::atomic<u32> g_FsAioReadID;
extern std::atomic<u32> g_FsAioReadCur;
int cellSysutilCheckCallback()
{
cellSysutil.Log("cellSysutilCheckCallback()");
@ -477,7 +480,7 @@ int cellSysutilCheckCallback()
CPUThread& thr = Emu.GetCallbackThread();
while (thr.IsAlive())
while (thr.IsAlive() || (g_FsAioReadCur < g_FsAioReadID))
{
Sleep(1);
if (Emu.IsStopped())