Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui_macos: Guard start_display_link against nil screens (#60419)

Lysastriel71b3b9b88742
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 938633d4749..d3d87608253 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -655,7 +655,10 @@ impl MacWindowState {
return;
}
}
- let display_id = unsafe { display_id_for_screen(self.native_window.screen()) };
+ let Some(display_id) = display_id_for_screen(unsafe { self.native_window.screen() }) else {
+ // AppKit can temporarily report no screen while displays are being reconfigured.
+ return;
+ };
if let Some(mut display_link) =
DisplayLink::new(display_id, self.native_view.as_ptr() as *mut c_void, step).log_err()
{
@@ -812,8 +815,10 @@ impl MacWindow {
let count: u64 = cocoa::foundation::NSArray::count(screens);
for i in 0..count {
let screen = cocoa::foundation::NSArray::objectAtIndex(screens, i);
+ let Some(display_id) = display_id_for_screen(screen) else {
+ continue;
+ };
let frame = NSScreen::frame(screen);
- let display_id = display_id_for_screen(screen);
if display_id == display.0 {
screen_frame = Some(frame);
target_screen = screen;
@@ -2995,13 +3000,17 @@ where
}
}
-unsafe fn display_id_for_screen(screen: id) -> CGDirectDisplayID {
+fn display_id_for_screen(screen: id) -> Option<CGDirectDisplayID> {
+ if screen.is_null() {
+ return None;
+ }
+
unsafe {
let device_description = NSScreen::deviceDescription(screen);
let screen_number_key: id = ns_string("NSScreenNumber");
let screen_number = device_description.objectForKey_(screen_number_key);
let screen_number: NSUInteger = msg_send![screen_number, unsignedIntegerValue];
- screen_number as CGDirectDisplayID
+ Some(screen_number as CGDirectDisplayID)
}
}
@@ -3153,3 +3162,13 @@ extern "C" fn toggle_tab_bar(this: &Object, _sel: Sel, _id: id) {
}
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn display_id_for_screen_returns_none_for_null_screen() {
+ assert_eq!(display_id_for_screen(nil), None);
+ }
+}