leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix seg-fault when using without a window (#1874)

Browse source 
* Fix seg-fault when using without a window #1869

* Update changelog
This commit is contained in:
Artúr Kovács 2021-03-06 11:17:23 +01:00 • committed by GitHub
parent 3571dcd68c
commit 4192d04a53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/platform_impl/macos/app_state.rs
View file

@ -341,9 +341,7 @@ impl AppState {
unsafe {
let app: id = NSApp();
let windows: id = msg_send![app, windows];
let window: id = msg_send![windows, objectAtIndex:0];
let window_count: usize = msg_send![windows, count];
assert_ne!(window, nil);
let dialog_open = if window_count > 1 {
let dialog: id = msg_send![windows, lastObject];
@ -373,16 +371,19 @@ impl AppState {
data2: 0
];
// To stop event loop immediately, we need to post some event here.
let _: () = msg_send![window, postEvent: dummy_event atStart: YES];
let _: () = msg_send![app, postEvent: dummy_event atStart: YES];
}
pool.drain();
let window_has_focus = msg_send![window, isKeyWindow];
if !dialog_open && window_has_focus && dialog_is_closing {
HANDLER.dialog_is_closing.store(false, Ordering::SeqCst);
}
if dialog_open {
HANDLER.dialog_is_closing.store(true, Ordering::SeqCst);
if window_count > 0 {
let window: id = msg_send![windows, objectAtIndex:0];
let window_has_focus = msg_send![window, isKeyWindow];
if !dialog_open && window_has_focus && dialog_is_closing {
HANDLER.dialog_is_closing.store(false, Ordering::SeqCst);
}
if dialog_open {
HANDLER.dialog_is_closing.store(true, Ordering::SeqCst);
}
}
};
}