RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-01-15 05:00:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Special nullptr optParam->cbFunc case fix

Browse source
This commit is contained in:
RipleyTom 2021-11-10 18:30:48 +01:00 committed by Megamouse
parent 50bf528f3f
commit b736691bde
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/NP/np_handler.cpp
View file

@ -548,9 +548,17 @@ namespace np
const u32 req_id = get_req_id(optParam ? optParam->appReqId : ctx->default_match2_optparam.appReqId);
ret.ctx_id = ctx_id;
ret.cb = optParam ? optParam->cbFunc : ctx->default_match2_optparam.cbFunc;
ret.cb_arg = optParam ? optParam->cbFuncArg : ctx->default_match2_optparam.cbFuncArg;
if (optParam && optParam->cbFunc)
{
ret.cb = optParam->cbFunc;
}
else
{
ret.cb = ctx->default_match2_optparam.cbFunc;
}
nph_log.warning("Callback used is 0x%x", ret.cb);
{