Added detection to JOGLAppletLauncher of whether DRIHack library is

present even if we didn't just download the native library jar. Worked
around deadlocks during termination of JOGL applets caused by new code
which causes context destruction to be performed on the AWT event
queue thread (more correct, but problematic with buggy code such as
sun.applet.AppletPanel which performs remove() calls on current
thread).


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@729 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 8 insertions, 0 deletions

diff --git a/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java b/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java
index ed0d9f296..303985b69 100755
--- a/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java
+++ b/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java
@@ -455,6 +455,14 @@ public class JOGLAppletLauncher extends Applet {
         displayError("Error opening jar file " + localJarFile.getName() + " for reading");
         return;
       }
+    } else {
+      // Still need to discover whether DRI hack is installed
+      File[] files = installDir.listFiles();
+      for (int i = 0; i < files.length; i++) {
+        if (files[i].getName().indexOf("jogl_drihack") >= 0) {
+          driHackPresent = true;
+        }
+      }
     }
 
     loadNativesAndStart(installDir);