JOGLNewtAppletBase et al - no dispose event at destruction, since it's critical within a browser

2 files changed, 12 insertions, 5 deletions

diff --git a/src/demos/applets/JOGLNewtApplet1Run.java b/src/demos/applets/JOGLNewtApplet1Run.java
index f839387..e3696ab 100755
--- a/src/demos/applets/JOGLNewtApplet1Run.java
+++ b/src/demos/applets/JOGLNewtApplet1Run.java
@@ -16,6 +16,7 @@ import com.sun.javafx.newt.opengl.*;
 
 public class JOGLNewtApplet1Run extends Applet {
     JOGLNewtAppletBase base;
+    Window nWindow = null;
 
     public void init() {
         if(!(this instanceof Container)) {
@@ -51,8 +52,8 @@ public class JOGLNewtApplet1Run extends Applet {
             GLCapabilities caps = new GLCapabilities(GLProfile.get(glProfileName));
             Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
             Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-            Window nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, new Object[] { container }, 
-                                                     nScreen, caps, true /* undecorated */);
+            nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, new Object[] { container }, 
+                                               nScreen, caps, true /* undecorated */);
             // nWindow.setPosition(x, y);
             // nWindow.setSize(container.getWidth(), container.getHeight());
             if(null!=nWindow) {
@@ -85,7 +86,12 @@ public class JOGLNewtApplet1Run extends Applet {
     }
 
     public void destroy() {
-        base.destroy();
+        base.destroy(false); // no dispose events
+        base=null;
+        if(null!=nWindow) {
+            nWindow.destroy();
+            nWindow=null;
+        }
     }
 }
 
diff --git a/src/demos/applets/JOGLNewtAppletBase.java b/src/demos/applets/JOGLNewtAppletBase.java
index 12d2af7..428e0b2 100755
--- a/src/demos/applets/JOGLNewtAppletBase.java
+++ b/src/demos/applets/JOGLNewtAppletBase.java
@@ -151,7 +151,8 @@ public class JOGLNewtAppletBase implements WindowListener, KeyListener, MouseLis
         }
     }
 
-    public void destroy() {
+    /** @param sendDisposeEvent should be false in a [time,reliable] critical shutdown */
+    public void destroy(boolean sendDisposeEvent) {
         isValid = false;
         if(null!=glAnimator) {
             glAnimator.stop();
@@ -159,7 +160,7 @@ public class JOGLNewtAppletBase implements WindowListener, KeyListener, MouseLis
             glAnimator=null;
         }
         if(null!=glWindow) {
-            glWindow.destroy(true); // deep, incl. Screen and Display
+            glWindow.destroy(sendDisposeEvent);
             glWindow=null;
         }
     }