alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-17 23:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #221 from tomaka/fix-rc

Browse source 
Fix race condition with XOpenIM
This commit is contained in:
tomaka 2015-01-25 12:55:58 +01:00
parent aa92625064 56c6afd03c
commit a2e03e7c15
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/x11/window/mod.rs
View file

@ -8,6 +8,7 @@ use std::sync::atomic::AtomicBool;
use std::collections::RingBuf;
use super::ffi;
use std::sync::{Arc, Once, ONCE_INIT};
use std::sync::{StaticMutex, MUTEX_INIT};
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
@ -262,6 +263,10 @@ impl Window {
// creating IM
let im = unsafe {
// XOpenIM doesn't seem to be thread-safe
static GLOBAL_XOPENIM_LOCK: StaticMutex = MUTEX_INIT;
let _lock = GLOBAL_XOPENIM_LOCK.lock().unwrap();
let im = ffi::XOpenIM(display, ptr::null(), ptr::null_mut(), ptr::null_mut());
if im.is_null() {
return Err(OsError(format!("XOpenIM failed")));