aboutsummaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorfl.gs <floinscription56@gmail.com>2026-05-23 21:19:34 +0200
committercrueter <crueter@eden-emu.dev>2026-05-23 21:19:34 +0200
commitb870bd255c2255ce4ec016560b3c8c58ae4368ca (patch)
tree674bc72049c7e090b25408b47eca8fdb3076901a /src/android
parent37b5cf60033b3624ed2b82a000568a5a2eda7b05 (diff)
[android] config: load configuration on game start (#3965)
This PR reloads Android configuration when starting a game, so Eden uses the latest config.ini state for the emulation session. On some Android launchers, Eden can already be running in the background before a game is launched. In that case, config.ini has already been read, so configuration changes made outside of Eden's settings flow while the process is alive are not picked up by the next emulation session. This improves launch/config behavior for external launcher workflows. Co-authored-by: FL-gs <efge.crea@gmail.com> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3965 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt2
-rw-r--r--src/android/app/src/main/jni/android_config.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index eab0fac705..a7dfc5398b 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -127,6 +127,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
super.onCreate(savedInstanceState)
+ NativeConfig.reloadGlobalConfig()
+
InputHandler.updateControllerData()
val players = NativeConfig.getInputSettings(true)
var hasConfiguredControllers = false
diff --git a/src/android/app/src/main/jni/android_config.cpp b/src/android/app/src/main/jni/android_config.cpp
index f697084348..e016322c23 100644
--- a/src/android/app/src/main/jni/android_config.cpp
+++ b/src/android/app/src/main/jni/android_config.cpp
@@ -19,6 +19,9 @@ AndroidConfig::AndroidConfig(const std::string& config_name, ConfigType config_t
}
void AndroidConfig::ReloadAllValues() {
+ // Ensure the INI file is current before reloading values.
+ SetUpIni();
+
Reload();
ReadAndroidValues();
SaveAndroidValues();