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

On macOS, fix deadlock during nested event loops (e.g. rfd)

Browse source
This commit is contained in:
J-P Nurmi 2023-10-25 17:13:44 +02:00 • committed by GitHub
parent 62ed51a138
commit f4e71a1d9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -12,6 +12,7 @@ Unreleased` header.
# Unreleased # Unreleased
- On Windows, fix deadlock when accessing the state during `Cursor{Enter,Leave}`. - On Windows, fix deadlock when accessing the state during `Cursor{Enter,Leave}`.
- On macOS, fix deadlock when entering a nested event loop from an event handler.
# 0.29.2 # 0.29.2

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

@ -494,9 +494,9 @@ impl AppState {
// Return when in callback due to https://github.com/rust-windowing/winit/issues/1779 // Return when in callback due to https://github.com/rust-windowing/winit/issues/1779
if panic_info.is_panicking() if panic_info.is_panicking()
|| HANDLER.get_in_callback()
|| !HANDLER.have_callback() || !HANDLER.have_callback()
|| !HANDLER.is_running() || !HANDLER.is_running()
|| HANDLER.get_in_callback()
{ {
return; return;
} }
@ -601,9 +601,9 @@ impl AppState {
// XXX: how does it make sense that `get_in_callback()` can ever return `true` here if we're // XXX: how does it make sense that `get_in_callback()` can ever return `true` here if we're
// about to return to the `CFRunLoop` to poll for new events? // about to return to the `CFRunLoop` to poll for new events?
if panic_info.is_panicking() if panic_info.is_panicking()
|| HANDLER.get_in_callback()
|| !HANDLER.have_callback() || !HANDLER.have_callback()
|| !HANDLER.is_running() || !HANDLER.is_running()
|| HANDLER.get_in_callback()
{ {
return; return;
} }