migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-01 14:20:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Reset the intterupted flag before breaking from run_forever

Browse Source 
This is important for any code that re-enters `run_forever` after some
previous interrupt.
This commit is contained in:
mitchmindtree
2017-05-25 00:11:32 +10:00
parent 7298df74bc
commit 1523548d3e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/linux/wayland/event_loop.rs
View File

@@ -193,7 +193,13 @@ impl EventsLoop {
let static_cb = unsafe { ::std::mem::transmute(Box::new(callback) as Box<FnMut(_)>) }; let static_cb = unsafe { ::std::mem::transmute(Box::new(callback) as Box<FnMut(_)>) };
let old_cb = unsafe { self.sink.lock().unwrap().set_callback(static_cb) }; let old_cb = unsafe { self.sink.lock().unwrap().set_callback(static_cb) };
while !self.interrupted.load(::std::sync::atomic::Ordering::Relaxed) { loop {
// If `interrupt` was called, break from the loop after resetting the flag.
if self.interrupted.load(::std::sync::atomic::Ordering::Relaxed) {
self.interrupted.store(false, ::std::sync::atomic::Ordering::Relaxed);
break;
}
self.ctxt.dispatch(); self.ctxt.dispatch();
evq_guard.dispatch_pending().expect("Wayland connection unexpectedly lost"); evq_guard.dispatch_pending().expect("Wayland connection unexpectedly lost");
let ids_guard = self.decorated_ids.lock().unwrap(); let ids_guard = self.decorated_ids.lock().unwrap();