platform_impl/linux/x11: fix deadlock in fn set_fullscreen_inner

Chain-Fox · kchibisov · Chain-Fox · commit 40706089d4f6 · 2020-05-27T23:56:34.000+08:00
Co-authored-by: Kirill Chibisov &lt;contact@kchibisov.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Unreleased
+- On X11, fix deadlock when calling `set_fullscreen_inner`.
 - On Web, prevent the webpage from scrolling when the user is focused on a winit canvas
 
 - On Wayland, fix deadlock when calling to `set_inner_size` from a callback.
diff --git a/src/platform_impl/linux/x11/window.rs b/src/platform_impl/linux/x11/window.rs
@@ -640,6 +640,7 @@ impl UnownedWindow {
                 let flusher = self.set_fullscreen_hint(false);
                 let mut shared_state_lock = self.shared_state.lock();
                 if let Some(position) = shared_state_lock.restore_position.take() {
+                    drop(shared_state_lock);
                     self.set_position_inner(position.0, position.1).queue();
                 }
                 Some(flusher)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# Unreleased`
	`2`	+- On X11, fix deadlock when calling `set_fullscreen_inner`.
`2`	`3`	`- On Web, prevent the webpage from scrolling when the user is focused on a winit canvas`
`3`	`4`
`4`	`5`	- On Wayland, fix deadlock when calling to `set_inner_size` from a callback.
Original file line number	Diff line number	Diff line change
`@@ -640,6 +640,7 @@ impl UnownedWindow {`
`640`	`640`	`let flusher = self.set_fullscreen_hint(false);`
`641`	`641`	`let mut shared_state_lock = self.shared_state.lock();`
`642`	`642`	`if let Some(position) = shared_state_lock.restore_position.take() {`
	`643`	`+ drop(shared_state_lock);`
`643`	`644`	`self.set_position_inner(position.0, position.1).queue();`
`644`	`645`	`}`
`645`	`646`	`Some(flusher)`