artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
android: Default to player number 0 if we get an input from an unreco…
This commit is contained in:
liamwhite 2023-11-01 13:50:50 -04:00 committed by GitHub
parent 48f913b6e7 344162db75
commit 7b10ceda02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
View file

@ -68,7 +68,7 @@ object InputHandler {
private fun getPlayerNumber(index: Int, deviceId: Int = -1): Int { private fun getPlayerNumber(index: Int, deviceId: Int = -1): Int {
var deviceIndex = index var deviceIndex = index
if (deviceId != -1) { if (deviceId != -1) {
deviceIndex = controllerIds[deviceId]!! deviceIndex = controllerIds[deviceId] ?: 0
} }
// TODO: Joycons are handled as different controllers. Find a way to merge them. // TODO: Joycons are handled as different controllers. Find a way to merge them.