mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 04:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
Ensure key window is a GPUIWindow before returning its id
This commit is contained in:
Antonio Scandurra 2021-09-03 17:59:02 +02:00 committed by GitHub
commit c3f1d43861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gpui/src/platform/mac/window.rs
View file

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