From 87a9dc9489b72c31af79b6170ccd34fcda9f40f7 Mon Sep 17 00:00:00 2001
From: t895 <clombardo169@gmail.com>
Date: Tue, 12 Dec 2023 13:40:00 -0500
Subject: android: Always use custom settings when launched from intent

---
 .../src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt   | 5 +++--
 1 file 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()
-- 
cgit v1.2.3