1 files changed, 21 insertions, 18 deletions
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 705b12783..4e63a8048 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -316,26 +316,29 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable {
         Exception ex1 = new Exception("dispose("+regenerate+") - start");
         ex1.printStackTrace();
     }
-    disposeRegenerate=regenerate;
 
-    if (Threading.isSingleThreaded() &&
-        !Threading.isOpenGLThread()) {
-      // Workaround for termination issues with applets --
-      // sun.applet.AppletPanel should probably be performing the
-      // remove() call on the EDT rather than on its own thread
-      if (ThreadingImpl.isAWTMode() &&
-          Thread.holdsLock(getTreeLock())) {
-        // The user really should not be invoking remove() from this
-        // thread -- but since he/she is, we can not go over to the
-        // EDT at this point. Try to destroy the context from here.
-        if(context.isCreated()) {
-            drawableHelper.invokeGL(drawable, context, disposeAction, null);
+    if(null!=context) {
+        disposeRegenerate=regenerate;
+
+        if (Threading.isSingleThreaded() &&
+            !Threading.isOpenGLThread()) {
+          // Workaround for termination issues with applets --
+          // sun.applet.AppletPanel should probably be performing the
+          // remove() call on the EDT rather than on its own thread
+          if (ThreadingImpl.isAWTMode() &&
+              Thread.holdsLock(getTreeLock())) {
+            // The user really should not be invoking remove() from this
+            // thread -- but since he/she is, we can not go over to the
+            // EDT at this point. Try to destroy the context from here.
+            if(context.isCreated()) {
+                drawableHelper.invokeGL(drawable, context, disposeAction, null);
+            }
+          } else if(context.isCreated()) {
+            Threading.invokeOnOpenGLThread(disposeOnEventDispatchThreadAction);
+          }
+        } else if(context.isCreated()) {
+          drawableHelper.invokeGL(drawable, context, disposeAction, null);
         }
-      } else if(context.isCreated()) {
-        Threading.invokeOnOpenGLThread(disposeOnEventDispatchThreadAction);
-      }
-    } else if(context.isCreated()) {
-      drawableHelper.invokeGL(drawable, context, disposeAction, null);
     }
 
     if(DEBUG) {