fix(macos): race condition when toggling traffic light, close tauri#9…

…210 (#901)
tauri-apps · Apr 3, 2024 · 9ef1379 · 9ef1379
1 parent 73883cb
commit 9ef1379
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.changes/fix-mac-style-mask-race-condition.md b/.changes/fix-mac-style-mask-race-condition.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+On macOS, fix an issue where the set minimize maximize and close buttons would interfere with each other.
diff --git a/src/platform_impl/macos/window.rs b/src/platform_impl/macos/window.rs
@@ -744,7 +744,7 @@ impl UnownedWindow {
       } else {
         mask &= !NSWindowStyleMask::NSResizableWindowMask;
       }
-      self.set_style_mask_async(mask);
+      self.set_style_mask_sync(mask);
     } // Otherwise, we don't change the mask until we exit fullscreen.
   }
 
@@ -756,7 +756,7 @@ impl UnownedWindow {
     } else {
       mask &= !NSWindowStyleMask::NSMiniaturizableWindowMask;
     }
-    self.set_style_mask_async(mask);
+    self.set_style_mask_sync(mask);
   }
 
   #[inline]
@@ -777,7 +777,7 @@ impl UnownedWindow {
     } else {
       mask &= !NSWindowStyleMask::NSClosableWindowMask;
     }
-    self.set_style_mask_async(mask);
+    self.set_style_mask_sync(mask);
   }
 
   pub fn set_cursor_icon(&self, cursor: CursorIcon) {