diff --git a/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java b/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java index 1e3145cf9..e8d312e51 100644 --- a/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java +++ b/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java @@ -85,7 +85,12 @@ public class ControllerHandler implements ControllerListener { } public static boolean vibrationSupported(){ - return isControllerConnected() && Controllers.getCurrent().canVibrate(); + try { + //library can throw a NPE here is controller was disconnected during sleep + return isControllerConnected() && Controllers.getCurrent().canVibrate(); + } catch (Exception e){ + return false; + } } public static void vibrate( int millis ){