diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt index 919d27aadd..7d341dcc26 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -242,9 +242,11 @@ class SettingsFragmentPresenter( add(BooleanSetting.USE_CUSTOM_CPU_TICKS.key) add(IntSetting.CPU_TICKS.key) - add(HeaderSetting(R.string.network)) - add(StringSetting.WEB_TOKEN.key) - add(StringSetting.WEB_USERNAME.key) + if (!NativeConfig.isPerGameConfigLoaded()) { + add(HeaderSetting(R.string.network)) + add(StringSetting.WEB_TOKEN.key) + add(StringSetting.WEB_USERNAME.key) + } } } @@ -1206,9 +1208,11 @@ class SettingsFragmentPresenter( add(SettingsItem.FASTMEM_COMBINED) add(BooleanSetting.CPUOPT_UNSAFE_HOST_MMU.key) - add(HeaderSetting(R.string.log)) + if (!NativeConfig.isPerGameConfigLoaded()) { + add(HeaderSetting(R.string.log)) - add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key) + add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key) + } add(HeaderSetting(R.string.general)) diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp index fdb7ac0833..0e304a87d6 100644 --- a/src/frontend_common/config.cpp +++ b/src/frontend_common/config.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2023 yuzu Emulator Project @@ -423,12 +423,12 @@ void Config::ReadValues() { ReadDataStorageValues(); ReadDebuggingValues(); ReadDisabledAddOnValues(); - ReadNetworkValues(); ReadServiceValues(); ReadWebServiceValues(); ReadMiscellaneousValues(); ReadLibraryAppletValues(); } + ReadNetworkValues(); ReadControlValues(); ReadCoreValues(); ReadCpuValues(); @@ -522,13 +522,13 @@ void Config::SaveValues() { SaveDataStorageValues(); SaveDebuggingValues(); SaveDisabledAddOnValues(); - SaveNetworkValues(); SaveWebServiceValues(); SaveMiscellaneousValues(); SaveLibraryAppletValues(); } else { LOG_DEBUG(Config, "Saving only generic configuration values"); } + SaveNetworkValues(); SaveControlValues(); SaveCoreValues(); SaveCpuValues();