aboutsummaryrefslogtreecommitdiffstats
path: root/src/x11
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2015-01-23 11:04:40 +0100
committerPierre Krieger <pierre.krieger1708@gmail.com>2015-01-23 11:10:23 +0100
commit56c6afd03cd739f02bc5012920d74ac06ae92ae3 (patch)
tree29764be41b438a729259e6a615f4175cab83244f /src/x11
parent1d6b863cd454839b8e3cf1e296cbf8f31fb70029 (diff)
downloadglutin-56c6afd03cd739f02bc5012920d74ac06ae92ae3.tar.gz
glutin-56c6afd03cd739f02bc5012920d74ac06ae92ae3.zip
Fix race condition with XOpenIM
Diffstat (limited to 'src/x11')
-rw-r--r--src/x11/window/mod.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs
index f4c296a..838a698 100644
--- a/src/x11/window/mod.rs
+++ b/src/x11/window/mod.rs
@@ -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")));