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

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
commit 4a50fa6c44
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,6 +160,7 @@ 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
@ -169,7 +170,8 @@ impl EventsLoop {
); );
// 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()