1 files changed, 11 insertions, 3 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLDebugMessageHandler.java b/src/jogl/classes/jogamp/opengl/GLDebugMessageHandler.java
index 8ca0c016d..b950c2fdf 100644
--- a/src/jogl/classes/jogamp/opengl/GLDebugMessageHandler.java
+++ b/src/jogl/classes/jogamp/opengl/GLDebugMessageHandler.java
@@ -35,6 +35,7 @@ import javax.media.opengl.GLDebugListener;
 import javax.media.opengl.GLDebugMessage;
 import javax.media.opengl.GLException;
 
+import com.jogamp.common.os.Platform;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 import jogamp.opengl.gl4.GL4bcProcAddressTable;
 
@@ -122,7 +123,14 @@ public class GLDebugMessageHandler {
             }
             return;            
         }
-        
+        if(Platform.OS_TYPE == Platform.OSType.WINDOWS && Platform.is32Bit()) {
+            // Currently buggy, ie. throws an exception after leaving the native callback.
+            // Probably a 32bit on 64bit JVM / OpenGL-driver issue.
+            if(DEBUG) {
+                System.err.println("GLDebugMessageHandler: Windows 32bit currently not supported!");
+            }
+            return;
+        }
         if( ctx.isExtensionAvailable(GL_ARB_debug_output) ) {
             extName = GL_ARB_debug_output;
             extType = EXT_ARB;
@@ -199,7 +207,7 @@ public class GLDebugMessageHandler {
      */
     public final void setSynchronous(boolean synchronous) {
         this.synchronous = synchronous;
-        if(isEnabled() && isExtensionARB()) {
+        if( isEnabled() ) {
             setSynchronousImpl();
         }
     }    
@@ -227,9 +235,9 @@ public class GLDebugMessageHandler {
         enableImpl(enable);
     }        
     final void enableImpl(boolean enable) throws GLException {
-        setSynchronousImpl();
         if(enable) {
             if(0 == handle) {
+                setSynchronousImpl();
                 handle = register0(glDebugMessageCallbackProcAddress, extType);
                 if(0 == handle) {
                     throw new GLException("Failed to register via \"glDebugMessageCallback*\" using "+extName);