Merge pull request #132 from zed-industries/fix-key-window

Antonio Scandurra created 4 years ago

Ensure key window is a GPUIWindow before returning its id

Change summary

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

Detailed changes

gpui/src/platform/mac/window.rs

@@ -245,11 +245,11 @@ impl Window {
         unsafe {
             let app = NSApplication::sharedApplication(nil);
             let key_window: id = msg_send![app, keyWindow];
-            if key_window.is_null() {
-                None
-            } else {
+            if msg_send![key_window, isKindOfClass: WINDOW_CLASS] {
                 let id = get_window_state(&*key_window).borrow().id;
                 Some(id)
+            } else {
+                None
             }
         }
     }