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

Fix game termination (again)

Browse source 
We wait for the emu to stop, so it doesn't make sense to return the loop
when we are "stopping".
This commit is contained in:
Megamouse 2025-05-08 21:52:41 +02:00
parent 21cdbd90e9
commit dd8734fce9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -6160,7 +6160,7 @@ s64 spu_thread::get_ch_value(u32 ch)
{
if (utils::has_waitpkg())
{
__tpause(std::min<u32>(eventstat_spin_count, 10) * 500, 0x1);
__tpause(std::min<u64>(eventstat_spin_count, 10) * 500, 0x1);
}
else
{
@ -6173,7 +6173,7 @@ s64 spu_thread::get_ch_value(u32 ch)
};
// Provide the first X64 cache line of the reservation to be tracked
__mwaitx<check_wait_t>(std::min<u32>(eventstat_spin_count, 17) * 500, 0xf0, std::addressof(*resrv_mem), +rtime, vm::reservation_acquire(raddr));
__mwaitx<check_wait_t>(std::min<u64>(eventstat_spin_count, 17) * 500, 0xf0, std::addressof(*resrv_mem), +rtime, vm::reservation_acquire(raddr));
}
}
else

2
rpcs3/Emu/System.cpp
View file

@ -2987,7 +2987,7 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
});
}
if (static_cast<u64>(info) != m_stop_ctr || Emu.IsStopped())
if (static_cast<u64>(info) != m_stop_ctr || Emu.IsStopped(true))
{
return true;
}