geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug #9331 - SDL3 Android crash getVibrator() == null

main
Sylvain 2024-03-22 21:26:23 +01:00 committed by Sam Lantinga
parent 208cd434b5
commit 1855ce68af
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
View File

@ -546,13 +546,15 @@ class SDLHapticHandler {
if (haptic == null) { if (haptic == null) {
InputDevice device = InputDevice.getDevice(deviceIds[i]); InputDevice device = InputDevice.getDevice(deviceIds[i]);
Vibrator vib = device.getVibrator(); Vibrator vib = device.getVibrator();
if (vib.hasVibrator()) { if (vib != null) {
haptic = new SDLHaptic(); if (vib.hasVibrator()) {
haptic.device_id = deviceIds[i]; haptic = new SDLHaptic();
haptic.name = device.getName(); haptic.device_id = deviceIds[i];
haptic.vib = vib; haptic.name = device.getName();
mHaptics.add(haptic); haptic.vib = vib;
SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name); mHaptics.add(haptic);
SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
}
} }
} }
} }