Fix GLDrawableHelper invokeGLImpl(..): Only attempt to release context after successfull claim; Also fix intendations of block.

1 files changed, 28 insertions, 25 deletions

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
index 1a18b3432..0f8b6b816 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
@@ -890,35 +890,38 @@ public class GLDrawableHelper {
         }
     }
     int res = GLContext.CONTEXT_NOT_CURRENT;
-  
+    
     try {
-      res = context.makeCurrent();
-      if (GLContext.CONTEXT_NOT_CURRENT != res) {
-        perThreadInitAction.set(initAction);
-        if (GLContext.CONTEXT_CURRENT_NEW == res) {
-          if (DEBUG) {
-            System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
-          }
-          initAction.run();
-        }
-        runnable.run();
-        if ( autoSwapBufferMode ) {
-            drawable.swapBuffers();
+        res = context.makeCurrent();
+        if (GLContext.CONTEXT_NOT_CURRENT != res) {
+            try {
+                perThreadInitAction.set(initAction);
+                if (GLContext.CONTEXT_CURRENT_NEW == res) {
+                    if (DEBUG) {
+                        System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
+                    }
+                    initAction.run();
+                }
+                runnable.run();
+                if ( autoSwapBufferMode ) {
+                    drawable.swapBuffers();
+                }
+            } finally {
+                try {
+                    context.release();
+                } catch (Exception e) {
+                    System.err.println("Catched: "+e.getMessage());
+                    e.printStackTrace();
+                }
+            }
         }
-      }
     } finally {
-      try {
-          context.release();
-      } catch (Exception e) {
-          System.err.println("Catched: "+e.getMessage());
-          e.printStackTrace();
-      }
-      if (lastContext != null) {
-        final int res2 = lastContext.makeCurrent();
-        if (null != lastInitAction && res2 == GLContext.CONTEXT_CURRENT_NEW) {
-          lastInitAction.run();
+        if (lastContext != null) {
+            final int res2 = lastContext.makeCurrent();
+            if (null != lastInitAction && res2 == GLContext.CONTEXT_CURRENT_NEW) {
+                lastInitAction.run();
+            }
         }
-      }
     }
   }