diff --git a/lib/communication/hid4java-0.7.2-SNAPSHOT.jar b/lib/communication/hid4java-0.7.2-SNAPSHOT.jar deleted file mode 100644 index d14601884..000000000 Binary files a/lib/communication/hid4java-0.7.2-SNAPSHOT.jar and /dev/null differ diff --git a/lib/communication/hid4java-0.8.0+7.jar b/lib/communication/hid4java-0.8.0+7.jar new file mode 100644 index 000000000..70e33a5f7 Binary files /dev/null and b/lib/communication/hid4java-0.8.0+7.jar differ diff --git a/src/qz/communication/H4J_HidUtilities.java b/src/qz/communication/H4J_HidUtilities.java index 989d678a2..de3dc8228 100644 --- a/src/qz/communication/H4J_HidUtilities.java +++ b/src/qz/communication/H4J_HidUtilities.java @@ -7,26 +7,16 @@ import org.hid4java.HidDevice; import org.hid4java.HidManager; import org.hid4java.HidServices; -import qz.utils.SystemUtilities; import javax.usb.util.UsbUtil; import java.util.HashSet; import java.util.List; public class H4J_HidUtilities { - - private static HidServices service = HidManager.getHidServices(); - + private static final HidServices service = HidManager.getHidServices(); public static List getHidDevices() { - List devices = service.getAttachedHidDevices(); - - // FIXME: Prevent hard crash on OSX - // Per upstream Mac bug https://github.com/gary-rowe/hid4java/issues/37 - if (SystemUtilities.isMac()) { - service.shutdown(); - } - return devices; + return service.getAttachedHidDevices(); } public static JSONArray getHidDevicesJSON() throws JSONException { @@ -72,5 +62,4 @@ public static HidDevice findDevice(DeviceOptions dOpts) { return null; } - }