android: Always use custom settings when launched from intent

3 years ago · 87a9dc9489
parent 6c6e8b8de0
commit 87a9dc9489
1 changed files with 3 additions and 2 deletions
--- 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()