summaryrefslogtreecommitdiffstats
path: root/src/android/app
diff options
context:
space:
mode:
authort895 <clombardo169@gmail.com>2023-12-12 19:40:00 +0100
committert895 <clombardo169@gmail.com>2023-12-12 23:25:37 +0100
commit87a9dc9489b72c31af79b6170ccd34fcda9f40f7 (patch)
treeefe693a0d3b823b4731b6f4d5d2b3221ed57641d /src/android/app
parentsettings: Allow vsync to be changed per-game (diff)
downloadyuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar
yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar.gz
yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar.bz2
yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar.lz
yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar.xz
yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar.zst
yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.zip
Diffstat (limited to 'src/android/app')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
index c40f5f41a..d7b38f62d 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@@ -128,8 +128,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
return
}
- if (args.custom) {
- SettingsFile.loadCustomConfig(args.game!!)
+ // Always load custom settings when launching a game from an intent
+ if (args.custom || intentGame != null) {
+ SettingsFile.loadCustomConfig(game)
NativeConfig.unloadPerGameConfig()
} else {
NativeConfig.reloadGlobalConfig()