1 files changed, 3 insertions, 1 deletions
diff --git a/src/net/java/games/jogl/impl/GLContext.java b/src/net/java/games/jogl/impl/GLContext.java
index 7ae7b1342..5a56bf9ee 100644
--- a/src/net/java/games/jogl/impl/GLContext.java
+++ b/src/net/java/games/jogl/impl/GLContext.java
@@ -698,8 +698,10 @@ public abstract class GLContext {
       // be OK since we are doing this very early in the maintenance
       // of the per-thread context stack, before we are actually
       // pushing any GLContext objects on it
-      renderingThread = null;
       SingleThreadedWorkaround.shouldDoWorkaround();
+      if( SingleThreadedWorkaround.doWorkaround() ) {
+        renderingThread = null;
+      }
     }
   }
 }