From 9aea2065ce824aa95ba69e516a5eb69c57a3c31d Mon Sep 17 00:00:00 2001 From: Boulay Mathias Date: Fri, 16 Sep 2022 18:59:09 +0200 Subject: [PATCH] Add a verification layer for the gamepad. --- .../net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java index daf76160d..463cc6805 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java @@ -265,8 +265,10 @@ public class Gamepad { } public static boolean isGamepadEvent(KeyEvent event){ - return ((event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD - && GamepadDpad.isDpadEvent(event) ); + boolean isGamepad = ((event.getSource() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) + || ((event.getDevice() != null) && ((event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD)); + + return isGamepad && GamepadDpad.isDpadEvent(event); } /**