Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deadlock in blocking_dispatch #695

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Fix deadlock in blocking_dispatch #695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions wayland-client/src/event_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,8 @@ impl<State> EventQueue<State> {
//
// We purposefully ignore the possible error, as that would make us early return in a way that might
// lose events, and the potential socket error will be caught in other places anyway.
let _ = backend.backend.dispatch_inner_queue();
let mut dispatched = backend.backend.dispatch_inner_queue().unwrap_or_default();

let mut dispatched = 0;
while let Some(QueueEvent(cb, msg, odata)) = Self::try_next(&qhandle.inner) {
cb(backend, msg, data, odata, qhandle)?;
dispatched += 1;
Expand Down
Loading