mirror of https://github.com/RPCS3/rpcs3.git
cellMsgDialogAbort: don't call on_close and properly re-enable pads
This commit is contained in:
parent
8dafc8e542
commit
3f00b485a0
|
@ -389,7 +389,7 @@ error_code cellMsgDialogAbort()
|
|||
{
|
||||
if (auto dlg = manager->get<rsx::overlays::message_dialog>())
|
||||
{
|
||||
dlg->close();
|
||||
dlg->close(false);
|
||||
return CELL_OK;
|
||||
}
|
||||
}
|
||||
|
@ -406,7 +406,9 @@ error_code cellMsgDialogAbort()
|
|||
return CELL_SYSUTIL_ERROR_BUSY;
|
||||
}
|
||||
|
||||
verify(HERE), fxm::remove<MsgDialogBase>();
|
||||
verify(HERE), fxm::remove<MsgDialogBase>(); // this shouldn't call on_close
|
||||
pad::SetIntercepted(false); // so we need to reenable the pads here
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -305,7 +305,7 @@ namespace rsx
|
|||
return 0;
|
||||
}
|
||||
|
||||
void user_interface::close()
|
||||
void user_interface::close(bool use_callback)
|
||||
{
|
||||
// Force unload
|
||||
exit = true;
|
||||
|
@ -322,7 +322,7 @@ namespace rsx
|
|||
|
||||
pad::SetIntercepted(false);
|
||||
|
||||
if (on_close)
|
||||
if (on_close && use_callback)
|
||||
on_close(return_code);
|
||||
}
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ namespace rsx
|
|||
close();
|
||||
}
|
||||
|
||||
void close();
|
||||
void close(bool use_callback = true);
|
||||
|
||||
s32 run_input_loop();
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue