alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

X11: Fix deadlock when an error occurs during startup (#1475)

Browse source
This commit is contained in:
Murarth 2020-02-19 10:39:00 -07:00 committed by GitHub
parent 522a6e3298
commit 9999f53329
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/platform_impl/linux/mod.rs
View file

@ -584,13 +584,12 @@ impl<T: 'static> EventLoop<T> {
} }
pub fn new_x11_any_thread() -> Result<EventLoop<T>, XNotSupported> { pub fn new_x11_any_thread() -> Result<EventLoop<T>, XNotSupported> {
X11_BACKEND let xconn = match X11_BACKEND.lock().as_ref() {
.lock() Ok(xconn) => xconn.clone(),
.as_ref() Err(err) => return Err(err.clone()),
.map(Arc::clone) };
.map(x11::EventLoop::new)
.map(EventLoop::X) Ok(EventLoop::X(x11::EventLoop::new(xconn)))
.map_err(|err| err.clone())
} }
#[inline] #[inline]