diff --git a/src/common/settings.h b/src/common/settings.h index 13651de575..d091cdc106 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -529,6 +529,7 @@ struct Values { Setting extended_logging{false, "extended_logging"}; Setting use_debug_asserts{false, "use_debug_asserts"}; Setting use_auto_stub{false, "use_auto_stub"}; + Setting accept_any_net{false, "accept_any_net"}; Setting enable_all_controllers{false, "enable_all_controllers"}; // Miscellaneous diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index e3ef06481d..969540c71b 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -6,6 +6,7 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nifm/nifm.h" +#include "common/settings.h" namespace { @@ -483,7 +484,7 @@ void IGeneralService::IsAnyInternetRequestAccepted(Kernel::HLERequestContext& ct IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - if (Network::GetHostIPv4Address().has_value()) { + if (Network::GetHostIPv4Address().has_value() && Settings::values.accept_any_net) { rb.Push(1); } else { rb.Push(0); diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 8ecd87150a..9d7fa4e08c 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -545,6 +545,7 @@ void Config::ReadDebuggingValues() { ReadBasicSetting(Settings::values.extended_logging); ReadBasicSetting(Settings::values.use_debug_asserts); ReadBasicSetting(Settings::values.use_auto_stub); + ReadBasicSetting(Settings::values.accept_any_net); ReadBasicSetting(Settings::values.enable_all_controllers); qt_config->endGroup(); diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index 04d3977509..fce68bbf64 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -47,6 +47,7 @@ void ConfigureDebug::SetConfiguration() { ui->quest_flag->setChecked(Settings::values.quest_flag.GetValue()); ui->use_debug_asserts->setChecked(Settings::values.use_debug_asserts.GetValue()); ui->use_auto_stub->setChecked(Settings::values.use_auto_stub.GetValue()); + ui->accept_any_net->setChecked(Settings::values.accept_any_net.GetValue()); ui->enable_all_controllers->setChecked(Settings::values.enable_all_controllers.GetValue()); ui->enable_graphics_debugging->setEnabled(runtime_lock); ui->enable_graphics_debugging->setChecked(Settings::values.renderer_debug.GetValue()); diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 47b8b80f16..c786de6626 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui @@ -306,6 +306,13 @@ + + + + Accept any Internet access** + + + diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 66dd0dc154..bcb7ab30c0 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -341,6 +341,7 @@ void Config::ReadValues() { ReadSetting("Debugging", Settings::values.quest_flag); ReadSetting("Debugging", Settings::values.use_debug_asserts); ReadSetting("Debugging", Settings::values.use_auto_stub); + ReadSetting("Debugging", Settings::values.accept_any_net); ReadSetting("Debugging", Settings::values.disable_macro_jit); ReadSetting("Debugging", Settings::values.use_gdbstub); ReadSetting("Debugging", Settings::values.gdbstub_port); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index d214771b0e..0c6a113fd9 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -431,6 +431,8 @@ use_debug_asserts = # Determines whether unimplemented HLE service calls should be automatically stubbed. # false: Disabled (default), true: Enabled use_auto_stub = +# false: Disabled, true: Enabled (default) +accept_any_net=true # Enables/Disables the macro JIT compiler disable_macro_jit=false # Determines whether to enable the GDB stub and wait for the debugger to attach before running.