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

Merge branch 'master' into pamfsave

Browse source
This commit is contained in:
Elad 2026-03-10 19:12:07 +02:00 committed by GitHub
parent 11a8322a8b 9e573a9ff2
commit bf621fbe13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/Emu/NP/rpcn_config.cpp
View file

@ -10,8 +10,7 @@ void cfg_rpcn::load()
{
const std::string path = cfg_rpcn::get_path();
fs::file cfg_file(path, fs::read);
if (cfg_file)
if (fs::file cfg_file(path, fs::read); cfg_file)
{
rpcn_log.notice("Loading RPCN config. Path: %s", path);
from_string(cfg_file.to_string());

2
rpcs3/Emu/NP/rpcn_config.h
View file

@ -4,7 +4,7 @@
struct cfg_rpcn : cfg::node
{
cfg::uint32 version{this, "Version", 1};
cfg::uint32 version{this, "Version", 2};
cfg::string host{this, "Host", "np.rpcs3.net"};
cfg::string npid{this, "NPID", ""};
cfg::string password{this, "Password", ""};

5
rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
View file

@ -1347,7 +1347,10 @@ rpcn_friends_dialog::rpcn_friends_dialog(QWidget* parent)
rpcn_friends_dialog::~rpcn_friends_dialog()
{
m_rpcn->remove_friend_cb(friend_callback, this);
if (m_rpcn)
{
m_rpcn->remove_friend_cb(friend_callback, this);
}
}
bool rpcn_friends_dialog::add_friend_with_error_dialog(const std::string& friend_username)