dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-08 10:31:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Set PSN to disconnected when net status is disconnected
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.2, ubuntu-24.04) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.2, ubuntu-24.04-arm) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.2, ubuntu-24.04) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Details

Browse Source
This commit is contained in:
RipleyTom 2025-03-25 15:28:04 +01:00 committed by Megamouse
parent 1b5d9a34df
commit 324af04426
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/NP/np_handler.cpp
View File

@ -858,7 +858,7 @@ namespace np
presence_self.pr_data = {};
presence_self.advertised = false;
if (g_cfg.net.psn_status == np_psn_status::psn_rpcn)
if (is_connected && is_psn_active && rpcn)
{
rpcn_log.notice("Setting RPCN state to disconnected!");
rpcn->reset_state();

6
rpcs3/Emu/System.cpp
View File

@ -303,6 +303,12 @@ static void fixup_settings(const psf::registry* _psf)
g_cfg.video.resolution.set(new_resolution);
}
}
if (g_cfg.net.net_active == np_internet_status::disabled && g_cfg.net.psn_status != np_psn_status::disabled)
{
sys_log.warning("Net status was set to disconnected so psn status was disabled");
g_cfg.net.psn_status.set(np_psn_status::disabled);
}
}
extern void dump_executable(std::span<const u8> data, const ppu_module<lv2_obj>* _module, std::string_view title_id)

10
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -1481,6 +1481,16 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
const auto [text, value] = get_data(ui->netStatusBox, index);
ui->gb_edit_dns->setEnabled(static_cast<np_internet_status>(value) != np_internet_status::disabled);
ui->enable_upnp->setEnabled(static_cast<np_internet_status>(value) != np_internet_status::disabled);
if (static_cast<np_internet_status>(value) == np_internet_status::disabled)
{
ui->psnStatusBox->setCurrentIndex(find_item(ui->psnStatusBox, static_cast<int>(g_cfg.net.psn_status.def)));
ui->psnStatusBox->setEnabled(false);
}
else
{
ui->psnStatusBox->setEnabled(true);
}
});
m_emu_settings->EnhanceComboBox(ui->netStatusBox, emu_settings_type::InternetStatus);
SubscribeTooltip(ui->gb_netStatusBox, tooltips.settings.net_status);