summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/opengl/macosx/cgl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-01-14 20:19:55 +0100
committerSven Gothel <[email protected]>2023-01-14 20:19:55 +0100
commitb367231929a8e4d8eac53933a59a297b75ef5e58 (patch)
tree5c6c402e664e951e3f3a5a3deaa5794b0ab19e4e /src/jogl/classes/jogamp/opengl/macosx/cgl
parentd2d1b56db362f2a5ce45e034141acb52f5254770 (diff)
MacOS: MacOSXCGLContext.NSOpenGLImpl.release(): Don't wait for releasing context view on MacOS >= 10.14 (deadlock)
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/macosx/cgl')
-rw-r--r--src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
index df17cedb3..8e944c2ef 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
@@ -1188,7 +1188,8 @@ public class MacOSXCGLContext extends GLContextImpl
if( !drawableAssociated ) {
lastNSViewDescr = null;
lastSetNSViewCmd = null;
- OSXUtil.RunOnMainThread(true /* wait */, true /* kickNSApp */, new Runnable() {
+ final boolean wait = !MacOSXCGLContext.isMojaveOrLater; // wait if < 10.14
+ OSXUtil.RunOnMainThread(wait, true /* kickNSApp */, new Runnable() {
@Override
public void run() {
CGL.setContextView(ctx, 0);