From 0015c724b3ebbe7fb32e210ac975acdd8bcd3ce2 Mon Sep 17 00:00:00 2001
From: endolf <endolf@java.net>
Date: Sun, 23 Sep 2007 02:01:26 +0000
Subject: [PATCH] Rather than crashing, just disable the plugin if we an't load
 the dll

---
 .../java/games/input/OSXEnvironmentPlugin.java    | 15 ++++++++++-----
 .../java/games/input/LinuxEnvironmentPlugin.java  |  7 ++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java b/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
index cc9289b..c900279 100755
--- a/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
+++ b/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
@@ -70,11 +70,16 @@ public final class OSXEnvironmentPlugin extends ControllerEnvironment implements
 		AccessController.doPrivileged(
 				new PrivilegedAction() {
 					public final Object run() {
-						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);
+					    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;
 					}
 				});
diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java b/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
index a2d1c8d..b8e9ef6 100644
--- a/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
+++ b/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
@@ -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;
 				}
 			}
 		}