Merge pull request #9376 from AvaloniaUI/fixes/macos-multi-window-freeze

[OSX] Fixed multi-window freeze on Show when another window is rendering
AvaloniaUI · Nov 8, 2022 · 186faca · 186faca
2 parents a344fec + e7681e9
commit 186faca
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/native/Avalonia.Native/src/OSX/rendertarget.mm b/native/Avalonia.Native/src/OSX/rendertarget.mm
@@ -183,8 +183,11 @@ - (void)updateLayer {
                 [_layer setContents: (__bridge IOSurface*) surface->surface];
             }
             [CATransaction commit];
-            [CATransaction flush];
         }
+        // This can trigger event processing on the main thread
+        // which might need to lock the renderer
+        // which can cause a deadlock. So flush call is outside of the lock
+        [CATransaction flush];
     }
     else
         dispatch_async(dispatch_get_main_queue(), ^{