Merge branch 'master' of github.com:sgothel/jogl

1 files changed, 4 insertions, 1 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
index 7a4e84081..8cc12ca89 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
@@ -136,6 +136,9 @@ public class GLDrawableHelper {
       lastContext.release();
     }
   
+    if(!context.isCreated() && null == initAction) {
+        throw new GLException("Context has to be created, but no initAction is given: "+context);
+    }
     int res = 0;
     try {
       res = context.makeCurrent();
@@ -154,7 +157,7 @@ public class GLDrawableHelper {
               System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running runnable");
             }
             runnable.run();
-            if (autoSwapBufferMode) {
+            if (autoSwapBufferMode && null != initAction) {
               if (drawable != null) {
                 drawable.swapBuffers();
               }