Fix crash when destroying window

rust-windowing · Jun 7, 2023 · 49126d1 · 49126d1
1 parent 8f7f3ef
commit 49126d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -71,6 +71,7 @@ And please only add new entries to the top of this list, right below the `# Unre
 - On Web, `EventLoopProxy` now implements `Send`.
 - On Web, `Window` now implements `Send` and `Sync`.
 - **Breaking:** `WindowExtWebSys::canvas()` now returns an `Option`.
+- On macOS, fix crash when dropping `Window`.
 
 # 0.28.6
 

diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs
@@ -243,7 +243,9 @@ declare_class!(
         fn draw_rect(&mut self, rect: NSRect) {
             trace_scope!("drawRect:");
 
-            AppState::handle_redraw(self.window_id());
+            if let Some(window) = self._ns_window.load() {
+                AppState::handle_redraw(WindowId(window.id()));
+            }
 
             #[allow(clippy::let_unit_value)]
             unsafe {