Skip to content

RPCN: settings fixes #18325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Megamouse merged 3 commits into from
Mar 10, 2026
Merged

RPCN: settings fixes #18325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
093e9dc
rpcn: Fix segfault in rpcn_settings_dialog destructor
Megamouse Mar 10, 2026
c3aef0c
rpcn: Fix file access error when loading rpcn.yml with version 1
Megamouse Mar 10, 2026
819f143
rpcn: set default version to 2
Megamouse Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions rpcs3/Emu/NP/rpcn_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/NP/rpcn_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", ""};
Expand Down
5 changes: 4 additions & 1 deletion rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down