Rather than crashing, just disable the plugin if we an't load the dll

This commit is contained in:
endolf 2007-09-23 02:01:26 +00:00
parent 69a2984615
commit 0015c724b3
2 changed files with 14 additions and 8 deletions

View file

@ -70,11 +70,16 @@ public final class OSXEnvironmentPlugin extends ControllerEnvironment implements
AccessController.doPrivileged(
new PrivilegedAction() {
public final Object run() {
try {
String lib_path = System.getProperty("net.java.games.input.librarypath");
if (lib_path != null)
System.load(lib_path + File.separator + System.mapLibraryName(lib_name));
else
System.loadLibrary(lib_name);
} catch (UnsatisfiedLinkError e) {
e.printStackTrace();
supported = false;
}
return null;
}
});

View file

@ -88,16 +88,17 @@ public final class LinuxEnvironmentPlugin extends ControllerEnvironment implemen
static {
String osName = getPrivilegedProperty("os.name", "").trim();
if(osName.equals("Linux")) {
supported = true;
try {
loadLibrary(LIBNAME);
supported = true;
} catch (UnsatisfiedLinkError e) {
try {
loadLibrary(LIBNAME + POSTFIX64BIT);
supported = true;
} catch (UnsatisfiedLinkError e2) {
logln("Failed to load 64 bit library: " + e2.getMessage());
// throw original error
throw e;
e.printStackTrace();
supported = false;
}
}
}