android: Always use custom settings when launched from intent
This commit is contained in:
parent
6c6e8b8de0
commit
87a9dc9489
|
@ -128,8 +128,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.custom) {
|
// Always load custom settings when launching a game from an intent
|
||||||
SettingsFile.loadCustomConfig(args.game!!)
|
if (args.custom || intentGame != null) {
|
||||||
|
SettingsFile.loadCustomConfig(game)
|
||||||
NativeConfig.unloadPerGameConfig()
|
NativeConfig.unloadPerGameConfig()
|
||||||
} else {
|
} else {
|
||||||
NativeConfig.reloadGlobalConfig()
|
NativeConfig.reloadGlobalConfig()
|
||||||
|
|
Reference in New Issue