alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where an NSEvent is produced when a user opens spotlight while

Browse source 
the NSApplication is in focus.

This NSEvent produces an undocumented NSEventType value `21` that has no
associated variant within the cocoa-rs crate's `NSEventType` enum, thus
causing a segfault when attemptingt to match on the value.

This commit adds a check for `21` to avoid the segfault.

This fixes #104.
This commit is contained in:
mitchmindtree 2017-02-05 19:01:27 +11:00
parent cbadc4bc31
commit 06c1b5903b
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/platform/macos/events_loop.rs
View file

@ -223,6 +223,16 @@ impl EventsLoop {
return None; return None;
} }
// FIXME: Despite not being documented anywhere, an `NSEvent` is produced when a user opens
// Spotlight while the NSApplication is in focus. This `NSEvent` produces a `NSEventType`
// with value `21`. This causes a SEGFAULT as soon as we try to match on the `NSEventType`
// enum as there is variant associated with the value. Thus, we return early if this sneaky
// event occurs. If someone does find some documentation on this, please fix this by adding
// an appropriate variant to the `NSEventType` enum in the cocoa-rs crate.
if ns_event.eventType() as u64 == 21 {
return None;
}
let event_type = ns_event.eventType(); let event_type = ns_event.eventType();
let ns_window = ns_event.window(); let ns_window = ns_event.window();
let window_id = super::window::get_window_id(ns_window); let window_id = super::window::get_window_id(ns_window);