Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix emulator crash when stopping emulation after being paused #13530

Merged
merged 3 commits into from
Apr 5, 2023
Merged

Fix emulator crash when stopping emulation after being paused #13530

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd8163f
Fix verification failure when using async shutdown after being paused
elad335 Mar 11, 2023
343f84d
Update System.cpp
elad335 Mar 11, 2023
d0f573c
Merge branch 'master' into patch-23
Megamouse Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion rpcs3/Emu/System.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2497,7 +2497,13 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
for (u32 i = 100; i < 140; i++)
{
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]()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this async?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::thread cannot execute BlockingCallFromMainThread which is present inside Resume().

{
Resume();
}, nullptr, true, read_counter);

process_qt_events(); // Is nullified when performed on non-main thread

if (!read_sysutil_signal && read_counter != get_sysutil_cb_manager_read_count())
Expand Down