1 files changed, 6 insertions, 0 deletions
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
index 37b19ec8a..2f3710eb2 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
@@ -103,6 +103,9 @@
   public Set glGetShaderBinaryFormats() 
   {
     if(null==shaderBinaryFormats) {
+        if(getContext()!=GLContext.getCurrent()) {
+            return new HashSet(0); // bail out
+        }
         HashSet formatSet = new HashSet();
 
         int[] param = new int[1];
@@ -126,6 +129,9 @@
 
   public boolean glShaderCompilerAvailable() {
     if(null==shaderCompilerAvailable) {
+        if(getContext()!=GLContext.getCurrent()) {
+            return false; // bail out
+        }
         Set bfs = glGetShaderBinaryFormats();
         if(isGLES2()) {
             byte[] param = new byte[1];