RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

cellSaveData: don't pause apps during dialogs

Browse source
This commit is contained in:
Megamouse 2019-12-29 01:01:54 +01:00
parent 6cfcb7b4f3
commit c4b4ce46b8
6 changed files with 137 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

43
rpcs3/Emu/Cell/Modules/cellSaveData.cpp
View file

@ -173,15 +173,14 @@ static error_code select_and_delete(ppu_thread& ppu)
selected = save_dialog->ShowSaveDataList(save_entries, focused, SAVEDATA_OP_LIST_DELETE, vm::null);
}
// Reschedule
if (ppu.check_state())
{
return 0;
}
// Abort if dialog was canceled or selection is invalid in this context
if (selected < 0)
{
// Reschedule
if (ppu.check_state())
{
return 0;
}
return CELL_CANCEL;
}
@ -196,6 +195,12 @@ static error_code select_and_delete(ppu_thread& ppu)
std::string msg = "Do you really want to delete this entry?\n\n" + info;
error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(msg));
// Reschedule
if (ppu.check_state())
{
return 0;
}
if (res != CELL_OK)
{
return CELL_SAVEDATA_ERROR_INTERNAL;
@ -805,15 +810,14 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
selected = -2;
}
// Reschedule
if (ppu.check_state())
{
return 0;
}
// Cancel selected in UI
if (selected == -2)
{
// Reschedule
if (ppu.check_state())
{
return 0;
}
return CELL_CANCEL;
}
@ -836,6 +840,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
// Get user confirmation
error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(message));
// Reschedule
if (ppu.check_state())
{
return 0;
}
if (res != CELL_OK)
{
return CELL_SAVEDATA_ERROR_INTERNAL;
@ -918,6 +928,9 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
if (fixedSet->option != CELL_SAVEDATA_OPTION_NOCONFIRM)
{
// Yield
lv2_obj::sleep(ppu);
std::string message;
if (selected == -1)
@ -934,6 +947,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
// Get user confirmation
error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(message));
// Reschedule
if (ppu.check_state())
{
return 0;
}
if (res != CELL_OK)
{
return CELL_SAVEDATA_ERROR_INTERNAL;