Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

dont use pointers for json

Browse Source
This commit is contained in:
m 2022-12-21 15:46:02 -06:00
parent dc511f915a
commit 04de9b822b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/component/party.cpp
View File

@ -313,25 +313,26 @@ namespace party
return (utils::properties::get_appdata_path() / "whitelist.json").generic_string();
}
bool get_whitelist_json_object(nlohmann::json* object)
nlohmann::json get_whitelist_json_object()
{
std::string data;
if (!utils::io::read_file(get_whitelist_json_path(), &data))
{
return false;
return nullptr;
}
nlohmann::json obj;
try
{
*object = nlohmann::json::parse(data.data());
obj = nlohmann::json::parse(data.data());
}
catch (const nlohmann::json::parse_error& ex)
{
menu_error(utils::string::va("%s\n", ex.what()));
return false;
return nullptr;
}
return false;
return obj;
}
std::string target_ip_to_string(const game::netadr_s& target)
@ -353,8 +354,8 @@ namespace party
return 0;
}
nlohmann::json obj;
if (!get_whitelist_json_object(&obj))
nlohmann::json obj = get_whitelist_json_object();
if (obj == nullptr)
{
return false;
}
@ -368,8 +369,8 @@ namespace party
bool should_user_confirm(const game::netadr_s& target, const utils::info_string& info)
{
nlohmann::json obj;
if (!get_whitelist_json_object(&obj))
nlohmann::json obj = get_whitelist_json_object();
if (obj == nullptr)
{
return false;
}