dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-20 12:55:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[android] Fix: Prevent crash on Bluetooth controller disconnect

Browse source
This commit is contained in:
edendev 2025-07-04 23:33:32 +00:00
parent d8bfc691d1
commit abbc4fefee
No known key found for this signature in database
GPG key ID: BA8734FD0EE46976
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,19 +37,23 @@ object InputHandler {
} }
fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
val controllerData = var controllerData = androidControllers[event.device.controllerNumber]
androidControllers[event.device.controllerNumber] ?: return false if (controllerData == null) {
event.device.motionRanges.forEach { updateControllerData()
NativeInput.onGamePadAxisEvent( controllerData = androidControllers[event.device.controllerNumber] ?: return false
controllerData.getGUID(),
controllerData.getPort(),
it.axis,
event.getAxisValue(it.axis)
)
}
return true
} }
event.device.motionRanges.forEach {
NativeInput.onGamePadAxisEvent(
controllerData.getGUID(),
controllerData.getPort(),
it.axis,
event.getAxisValue(it.axis)
)
}
return true
}
fun getDevices(): Map<Int, YuzuPhysicalDevice> { fun getDevices(): Map<Int, YuzuPhysicalDevice> {
val gameControllerDeviceIds = mutableMapOf<Int, YuzuPhysicalDevice>() val gameControllerDeviceIds = mutableMapOf<Int, YuzuPhysicalDevice>()
val deviceIds = InputDevice.getDeviceIds() val deviceIds = InputDevice.getDeviceIds()