From 2fa4a2756e65576741db2d1986b66409b4deca90 Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Sat, 22 May 2021 15:48:22 +0200 Subject: [PATCH] Fix crash due to crash when a controller isn't recognized --- .../pojavlaunch/customcontrols/gamepad/GamepadJoystick.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java index f1786c850..ac12f2e78 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java @@ -27,8 +27,9 @@ public class GamepadJoystick { this.verticalAxis = verticalAxis; this.horizontalAxis = horizontalAxis; - deadzone = Math.max(device.getMotionRange(verticalAxis).getFlat(), - device.getMotionRange(horizontalAxis).getFlat()) * 2f; + //Some controllers aren't recognized as such by android, so we fallback to a default value of 0.2 + deadzone = device != null ? Math.max(device.getMotionRange(verticalAxis).getFlat(), + device.getMotionRange(horizontalAxis).getFlat()) * 2f : 0.2f; if(deadzone < 0.15) deadzone = 0.15f; }