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

Fix deadlock wayland. (#1438)

Browse Source
This commit is contained in:
David Craven
2020-02-05 00:46:19 +01:00
committed by GitHub
parent 2f8aa5c52a
commit c1eb7f9629
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform_impl/linux/wayland/window.rs
View File

@@ -481,9 +481,10 @@ impl WindowStore {
for window in &mut self.windows { for window in &mut self.windows {
let opt_arc = window.frame.upgrade(); let opt_arc = window.frame.upgrade();
let mut opt_mutex_lock = opt_arc.as_ref().map(|m| m.lock().unwrap()); let mut opt_mutex_lock = opt_arc.as_ref().map(|m| m.lock().unwrap());
let mut size = { *window.size.lock().unwrap() };
f(WindowStoreForEach { f(WindowStoreForEach {
newsize: window.newsize.take(), newsize: window.newsize.take(),
size: &mut *(window.size.lock().unwrap()), size: &mut size,
prev_dpi: window.current_dpi, prev_dpi: window.current_dpi,
new_dpi: window.new_dpi, new_dpi: window.new_dpi,
closed: window.closed, closed: window.closed,
@@ -492,6 +493,7 @@ impl WindowStore {
wid: make_wid(&window.surface), wid: make_wid(&window.surface),
frame: opt_mutex_lock.as_mut().map(|m| &mut **m), frame: opt_mutex_lock.as_mut().map(|m| &mut **m),
}); });
*window.size.lock().unwrap() = size;
if let Some(dpi) = window.new_dpi.take() { if let Some(dpi) = window.new_dpi.take() {
window.current_dpi = dpi; window.current_dpi = dpi;
} }