Browse Source
Merge pull request #11940 from t895/controller-null-check
android: Default to player number 0 if we get an input from an unreco…
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
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. |
|
|
|
|
