summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2024-02-18 16:27:49 +0100
committerGitHub <noreply@github.com>2024-02-18 16:27:49 +0100
commit55839576166d546c037d5da2f7bdf3c94ec47423 (patch)
tree09d0b5f92e54286695cbdaf8901b76f83b74b9ca /src/android
parentMerge pull request #13049 from Leystryku/master (diff)
parentandroid: Only do first startup automapping if nothing has been mapped (diff)
downloadyuzu-55839576166d546c037d5da2f7bdf3c94ec47423.tar
yuzu-55839576166d546c037d5da2f7bdf3c94ec47423.tar.gz
yuzu-55839576166d546c037d5da2f7bdf3c94ec47423.tar.bz2
yuzu-55839576166d546c037d5da2f7bdf3c94ec47423.tar.lz
yuzu-55839576166d546c037d5da2f7bdf3c94ec47423.tar.xz
yuzu-55839576166d546c037d5da2f7bdf3c94ec47423.tar.zst
yuzu-55839576166d546c037d5da2f7bdf3c94ec47423.zip
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index 0b70fccec..c962558a7 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -80,8 +80,14 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
super.onCreate(savedInstanceState)
InputHandler.updateControllerData()
- val playerOne = NativeConfig.getInputSettings(true)[0]
- if (!playerOne.hasMapping() && InputHandler.androidControllers.isNotEmpty()) {
+ val players = NativeConfig.getInputSettings(true)
+ var hasConfiguredControllers = false
+ players.forEach {
+ if (it.hasMapping()) {
+ hasConfiguredControllers = true
+ }
+ }
+ if (!hasConfiguredControllers && InputHandler.androidControllers.isNotEmpty()) {
var params: ParamPackage? = null
for (controller in InputHandler.registeredControllers) {
if (controller.get("port", -1) == 0) {