Changeset 49294 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Oct 25, 2013 4:02:21 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: fix 2D crash on shutdown

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -180 +180 @@
     while(0);
 
+static NSOpenGLContext * vboxCtxGetCurrent()
+{
+    GET_CONTEXT(pCtxInfo);
+    if (pCtxInfo)
+    {
+        Assert(pCtxInfo->context);
+        return pCtxInfo->context;
+    }
+
+    return nil;
+}
 
 static bool vboxCtxSyncCurrentInfo()
@@ -219 +230 @@
 static void vboxCtxEnter(NSOpenGLContext*pCtx, PVBOX_CR_RENDER_CTX_INFO pCtxInfo)
 {
-    NSOpenGLContext *pOldCtx = [NSOpenGLContext currentContext];
+    NSOpenGLContext *pOldCtx = vboxCtxGetCurrent(); 
     NSView *pOldView = (pOldCtx ? [pOldCtx view] : nil);
     NSView *pView = [pCtx view];
@@ -1016 +1027 @@
     
         vboxCtxLeave(&CtxInfo);
-        
-        vboxCtxSyncCurrentInfo();
     }
 }
@@ -1268 +1277 @@
     
     vboxCtxLeave(&CtxInfo);
-    
-    vboxCtxSyncCurrentInfo();
 }