Merge pull request #11940 from t895/controller-null-check

android: Default to player number 0 if we get an input from an unreco…
2023-11-01 13:50:50 -04:00 · 2023-11-01 13:50:50 -04:00 · 7b10ceda02
commit 7b10ceda02
parent 48f913b6e7 344162db75
1 changed files with 1 additions and 1 deletions
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
@ -68,7 +68,7 @@ object InputHandler {
    private fun getPlayerNumber(index: Int, deviceId: Int = -1): Int {
        var deviceIndex = index
        if (deviceId != -1) {
-            deviceIndex = controllerIds[deviceId]!!
+            deviceIndex = controllerIds[deviceId] ?: 0
        }

        // TODO: Joycons are handled as different controllers. Find a way to merge them.