winemac: Only manipulate an NSOpenGLContext's view on the main thread.

I was seeing a crash due to an assert about manipulating it on a background thread. I can't recall where I was seeing that. I think it's new in Catalina. Signed-off-by: Chip Davis <cdavis@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Only manipulate an NSOpenGLContext's view on the main thread.
1261589c · Ken Thomases · Alexandre Julliard · c70c1056 · 1261589c
Commit 1261589c authored Dec 11, 2019 by Ken Thomases Committed by Alexandre Julliard Dec 11, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

cocoa_opengl.m dlls/winemac.drv/cocoa_opengl.m +14 -4

No files found.
--- a/dlls/winemac.drv/cocoa_opengl.m
+++ b/dlls/winemac.drv/cocoa_opengl.m
@@ -79,8 +79,10 @@
            macdrv_set_view_backing_size((macdrv_view)self.view, view_backing);

            NSView* save = self.view;
-            [super clearDrawable];
-            [super setView:save];
+            OnMainThread(^{
+                [super clearDrawable];
+                [super setView:save];
+            });
            shouldClearToBlack = TRUE;
        }
    }
@@ -122,7 +124,11 @@
    - (void) setView:(NSView*)newView
    {
        NSView* oldView = [self view];
-        [super setView:newView];
+        if ([NSThread isMainThread])
+            [super setView:newView];
+        else OnMainThread(^{
+            [super setView:newView];
+        });
        [newView retain];
        [oldView release];
    }
@@ -130,7 +136,11 @@
    - (void) clearDrawable
    {
        NSView* oldView = [self view];
-        [super clearDrawable];
+        if ([NSThread isMainThread])
+            [super clearDrawable];
+        else OnMainThread(^{
+            [super clearDrawable];
+        });
        [oldView release];

        [self wine_updateBackingSize:NULL];