Fix segfault when dropping MacWindow (cherry-pick #9267) (#9269)

gcp-cherry-pick-bot[bot] , Thorsten Ball , and Antonio created 2 years ago

Cherry-picked Fix segfault when dropping MacWindow (#9267)

This avoids calling `window.setDelegate(nil)` when the window was
already closed.

Release Notes:

- Fixed a segfault that could show up when closing windows.

Co-authored-by: Antonio <[e-mail]>

Co-authored-by: Thorsten Ball <[e-mail]>
Co-authored-by: Antonio <[e-mail]>

Change summary

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

Detailed changes

crates/gpui/src/platform/mac/window.rs

@@ -738,10 +738,11 @@ impl Drop for MacWindow {
         this.renderer.destroy();
         let window = this.native_window;
         this.display_link.take();
-        unsafe {
-            this.native_window.setDelegate_(nil);
-        }
         if !this.native_window_was_closed {
+            unsafe {
+                this.native_window.setDelegate_(nil);
+            }
+
             this.executor
                 .spawn(async move {
                     unsafe {