summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-11-01 18:10:51 +0100
committerCharles Lombardo <clombardo169@gmail.com>2023-11-01 18:10:51 +0100
commit344162db75bffd0de9b43d18d2d789c1fd564e57 (patch)
treeaced1419f58e63bebbcbf939b6929f827fa7b37d /src/android
parentMerge pull request #11937 from t895/reorganize-options (diff)
downloadyuzu-344162db75bffd0de9b43d18d2d789c1fd564e57.tar
yuzu-344162db75bffd0de9b43d18d2d789c1fd564e57.tar.gz
yuzu-344162db75bffd0de9b43d18d2d789c1fd564e57.tar.bz2
yuzu-344162db75bffd0de9b43d18d2d789c1fd564e57.tar.lz
yuzu-344162db75bffd0de9b43d18d2d789c1fd564e57.tar.xz
yuzu-344162db75bffd0de9b43d18d2d789c1fd564e57.tar.zst
yuzu-344162db75bffd0de9b43d18d2d789c1fd564e57.zip
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt2
1 files changed, 1 insertions, 1 deletions
diff --git 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
index fc6a8b5cb..47bde5081 100644
--- 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.