RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpcn: throw exception when using rpcn features without a proper config

Browse source
This commit is contained in:
Megamouse 2023-03-03 10:45:29 +01:00
parent 14c0289542
commit 1d7a00666e
7 changed files with 47 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -441,6 +441,16 @@ namespace np
}
}
std::shared_ptr<rpcn::rpcn_client> np_handler::get_rpcn()
{
if (!rpcn) [[unlikely]]
{
ensure(g_cfg.net.psn_status == np_psn_status::psn_fake);
fmt::throw_exception("RPCN is required to use PSN online features.");
}
return rpcn;
}
void np_handler::save(utils::serial& ar)
{
// TODO: See ctor
@ -812,7 +822,7 @@ namespace np
std::optional<std::shared_ptr<std::pair<std::string, message_data>>> np_handler::get_message(u64 id)
{
return rpcn->get_message(id);
return get_rpcn()->get_message(id);
}
void np_handler::operator()()
@ -1025,17 +1035,17 @@ namespace np
u32 np_handler::get_num_friends()
{
return rpcn->get_num_friends();
return get_rpcn()->get_num_friends();
}
u32 np_handler::get_num_blocks()
{
return rpcn->get_num_blocks();
return get_rpcn()->get_num_blocks();
}
std::pair<error_code, std::optional<SceNpId>> np_handler::get_friend_by_index(u32 index)
{
auto str_friend = rpcn->get_friend_by_index(index);
auto str_friend = get_rpcn()->get_friend_by_index(index);
if (!str_friend)
{