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

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

View File

@ -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.