From 8e2e5b5cf097391b9a4c803922c90951e87b3926 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 13 Jul 2022 10:38:34 +0200
Subject: [PATCH] Don't borrow window state mutably until we need to invoke
 resize callback

---
 crates/gpui/src/platform/mac/window.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index ef892ec316469786a039e7ef5ec819bcfc4f473b..43ce09ffffe2bf01292c52da42b456c9a7b9baab 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -802,7 +802,7 @@ extern "C" fn view_did_change_backing_properties(this: &Object, _: Sel) {
 
 extern "C" fn set_frame_size(this: &Object, _: Sel, size: NSSize) {
     let window_state = unsafe { get_window_state(this) };
-    let mut window_state_borrow = window_state.as_ref().borrow_mut();
+    let window_state_borrow = window_state.as_ref().borrow();
 
     if window_state_borrow.size() == vec2f(size.width as f32, size.height as f32) {
         return;
@@ -822,6 +822,8 @@ extern "C" fn set_frame_size(this: &Object, _: Sel, size: NSSize) {
         let _: () = msg_send![window_state_borrow.layer, setDrawableSize: drawable_size];
     }
 
+    drop(window_state_borrow);
+    let mut window_state_borrow = window_state.borrow_mut();
     if let Some(mut callback) = window_state_borrow.resize_callback.take() {
         drop(window_state_borrow);
         callback();