aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavelBARABANOV <pavelbarabanov94@gmail.com>2026-01-25 16:09:27 +0100
committercrueter <crueter@eden-emu.dev>2026-01-25 16:09:27 +0100
commit6504c7cc4c412ea99f1fd4a1cb717bcb76cdd96d (patch)
tree9bdb9e972845622252bbb0c683b67809d95c1036
parentddbb6f221924eefb57b8a9b0c346462da56c4527 (diff)
[android, frontend_common] Remove network/logging sections and fix airplane mode in per-game (#3384)
Fixed an issue with airplane settings Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3384 Reviewed-by: DraVee <dravee@eden-emu.dev> Reviewed-by: Maufeat <sahyno1996@gmail.com> Co-authored-by: PavelBARABANOV <pavelbarabanov94@gmail.com> Co-committed-by: PavelBARABANOV <pavelbarabanov94@gmail.com>
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt14
-rw-r--r--src/frontend_common/config.cpp6
2 files changed, 12 insertions, 8 deletions
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();