Explorar o código

android: Always use custom settings when launched from intent

t895 %!s(int64=2) %!d(string=hai) anos
pai
achega
87a9dc9489

+ 3 - 2
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()