shadowfacts/jinput-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/jinput-arm64.git synced 2025-12-06 08:01:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mac OS X: Don't fail the entire device enumeration when one device fails to open

Browse source
This commit is contained in:
elias 2007-02-25 20:40:02 +00:00
parent 7bf9a5d428
commit d71de8a642
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
View file

@ -190,24 +190,31 @@ public final class OSXEnvironmentPlugin extends ControllerEnvironment implements
try {
OSXHIDDeviceIterator it = new OSXHIDDeviceIterator();
try {
OSXHIDDevice device;
while ((device = it.next()) != null) {
boolean device_used = false;
while (true) {
OSXHIDDevice device;
try {
int old_size = controllers.size();
createControllersFromDevice(device, controllers);
device_used = old_size != controllers.size();
device = it.next();
if (device == null)
break;
boolean device_used = false;
try {
int old_size = controllers.size();
createControllersFromDevice(device, controllers);
device_used = old_size != controllers.size();
} catch (IOException e) {
ControllerEnvironment.logln("Failed to create controllers from device: " + device.getProductName());
}
if (!device_used)
device.release();
} catch (IOException e) {
ControllerEnvironment.logln("Failed to create controllers from device: " + device.getProductName());
ControllerEnvironment.logln("Failed to enumerate device: " + e.getMessage());
}
if (!device_used)
device.release();
}
} finally {
it.close();
}
} catch (IOException e) {
ControllerEnvironment.log("Failed to enumerate device: " + e.getMessage());
ControllerEnvironment.log("Failed to enumerate devices: " + e.getMessage());
return new Controller[]{};
}
Controller[] controllers_array = new Controller[controllers.size()];