From fe4e3ef70839289db37a5f45512f09e3507831e3 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 30 Sep 2024 18:33:19 -0400
Subject: [PATCH] v2.5.3: added a safety check to controller handler

---
 .../src/main/java/com/watabou/input/ControllerHandler.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 ){