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

Fix emulator crash when stopping emulation after being paused (#13530)

Browse source
This commit is contained in:
Elad Ashkenazi 2023-04-05 22:53:01 +03:00 • committed by GitHub
parent 8a509afc20
commit c6ab1aa227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/System.cpp
View file

@ -2498,7 +2498,13 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
for (u32 i = 100; i < 140; i++) for (u32 i = 100; i < 140; i++)
{ {
std::this_thread::sleep_for(50ms); std::this_thread::sleep_for(50ms);
Resume(); // TODO: Prevent pausing by other threads while in this loop
// TODO: Prevent pausing by other threads while in this loop
CallFromMainThread([this]()
{
Resume();
}, nullptr, true, read_counter);
process_qt_events(); // Is nullified when performed on non-main thread process_qt_events(); // Is nullified when performed on non-main thread
if (!read_sysutil_signal && read_counter != get_sysutil_cb_manager_read_count()) if (!read_sysutil_signal && read_counter != get_sysutil_cb_manager_read_count())