diff options
| author |  t895 | 2023-12-12 13:40:00 -0500 |
|---|---|---|
| committer | t895 | 2023-12-12 17:25:37 -0500 |
| commit | 87a9dc9489b72c31af79b6170ccd34fcda9f40f7 (patch) | |
| tree | efe693a0d3b823b4731b6f4d5d2b3221ed57641d /src/android | |
| parent | settings: Allow vsync to be changed per-game (diff) | |
| download | yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar.gz yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.tar.xz yuzu-87a9dc9489b72c31af79b6170ccd34fcda9f40f7.zip | |
android: Always use custom settings when launched from intent
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt | 5 |
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 { | |||
| 128 | return | 128 | return |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | if (args.custom) { | 131 | // Always load custom settings when launching a game from an intent |
| 132 | SettingsFile.loadCustomConfig(args.game!!) | 132 | if (args.custom || intentGame != null) { |
| 133 | SettingsFile.loadCustomConfig(game) | ||
| 133 | NativeConfig.unloadPerGameConfig() | 134 | NativeConfig.unloadPerGameConfig() |
| 134 | } else { | 135 | } else { |
| 135 | NativeConfig.reloadGlobalConfig() | 136 | NativeConfig.reloadGlobalConfig() |