RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-23 11:13:19 +01:00
Code Issues Releases Wiki Activity

Fixes: cellMsgDialog, cellPad

Browse Source
This commit is contained in:
Jake 2017-03-11 01:13:53 -06:00
parent a6f8e4f6b3
commit 309f409554
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
View File

@ -269,7 +269,7 @@ s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr<char> msgStrin
return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
}
if (progressBarIndex >= dlg->type.progress_bar_count)
if (progressBarIndex >= dlg->type.progress_bar_count || !msgString)
{
return CELL_MSGDIALOG_ERROR_PARAM;
}

5
rpcs3/Emu/Cell/Modules/cellPad.cpp
View File

@ -12,15 +12,12 @@ s32 cellPadInit(u32 max_connect)
{
sys_io.warning("cellPadInit(max_connect=%d)", max_connect);
if (max_connect > CELL_PAD_MAX_PORT_NUM)
return CELL_PAD_ERROR_INVALID_PARAMETER;
const auto handler = fxm::import<PadHandlerBase>(Emu.GetCallbacks().get_pad_handler);
if (!handler)
return CELL_PAD_ERROR_ALREADY_INITIALIZED;
handler->Init(max_connect);
handler->Init(std::min(max_connect, CELL_PAD_MAX_PORT_NUM));
return CELL_OK;
}