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

Merge pull request #181 from vberger/master

Browse source 
wayland: Fix deadlock in poll_events
This commit is contained in:
tomaka 2017-05-14 17:09:21 +02:00 committed by GitHub
parent c33bedce5e c2c27c1b37
commit 4a50fa6c44
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/platform/linux/wayland/event_loop.rs
View file

@ -160,16 +160,18 @@ impl EventsLoop {
self.ctxt.dispatch_pending(); self.ctxt.dispatch_pending();
evq_guard.dispatch_pending().expect("Wayland connection unexpectedly lost"); evq_guard.dispatch_pending().expect("Wayland connection unexpectedly lost");
let mut sink_guard = self.sink.lock().unwrap(); {
let mut sink_guard = self.sink.lock().unwrap();
// events where probably dispatched, process resize // events where probably dispatched, process resize
let ids_guard = self.decorated_ids.lock().unwrap(); let ids_guard = self.decorated_ids.lock().unwrap();
sink_guard.with_callback( sink_guard.with_callback(
|cb| Self::process_resize(&mut evq_guard, &ids_guard, cb) |cb| Self::process_resize(&mut evq_guard, &ids_guard, cb)
); );
// replace the old noop callback // replace the old noop callback
unsafe { self.sink.lock().unwrap().set_callback(old_cb) }; unsafe { sink_guard.set_callback(old_cb) };
}
if self.cleanup_needed.swap(false, ::std::sync::atomic::Ordering::Relaxed) { if self.cleanup_needed.swap(false, ::std::sync::atomic::Ordering::Relaxed) {
self.prune_dead_windows() self.prune_dead_windows()