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.

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

Fix sysutil_send_system_cmd at Emu.Stop() #9950

Merged
merged 1 commit into from Mar 12, 2021
Merged

Conversation

elad335
Copy link
Contributor

@elad335 elad335 commented Mar 12, 2021

Bugfixes

  • When Emu.Stop() is called by GUI thread, PPU threads should still be able to send sysutil events.
  • Reset main_window::m_sys_menu_opened at Emu.Stop().
  • When sysutil_cb_manager is not initialized in FXO, sysutil_send_system_cmd would invoke UB.

@elad335 elad335 force-pushed the sysutil branch 3 times, most recently from 4731775 to 4531756 Compare March 12, 2021 08:55
@@ -57,7 +57,7 @@ extern void sysutil_register_cb(std::function<s32(ppu_thread&)>&& cb)

extern void sysutil_send_system_cmd(u64 status, u64 param)
{
if (auto& cbm = g_fxo->get<sysutil_cb_manager>(); g_fxo->is_init<sysutil_cb_manager>() && !Emu.IsStopped())
if (auto& cbm = g_fxo->get<sysutil_cb_manager>(); g_fxo->is_init<sysutil_cb_manager>())
Copy link
Contributor

Choose a reason for hiding this comment

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

idk about this one. the rest looks ok

@Nekotekina Nekotekina merged commit 923ba6f into RPCS3:master Mar 12, 2021
@elad335 elad335 deleted the sysutil branch March 16, 2021 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants