migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 07:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

[MacOS] Fix deadlock on maximizing window from event callback (#2636)

Browse Source
This commit is contained in:
Andreas Reich
2023-01-21 17:29:29 +01:00
committed by GitHub
parent b711a11549
commit a867032e1e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform_impl/macos/app_state.rs
View File

@@ -352,7 +352,13 @@ impl AppState {
}
pub fn handle_redraw(window_id: WindowId) {
HANDLER.handle_nonuser_event(EventWrapper::StaticEvent(Event::RedrawRequested(window_id)));
// Redraw request might come out of order from the OS.
// -> Don't go back into the callback when our callstack originates from there
if !HANDLER.in_callback.swap(true, Ordering::AcqRel) {
HANDLER
.handle_nonuser_event(EventWrapper::StaticEvent(Event::RedrawRequested(window_id)));
HANDLER.set_in_callback(false);
}
}
pub fn queue_event(wrapper: EventWrapper) {