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

Fix bad memory being passed (due to going out of scope) to set title on X11.

Browse source
This commit is contained in:
Glenn Watson 2014-10-27 14:54:21 +10:00
parent 41d7118a42
commit 7800b14749
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,8 @@ impl Window {
let mut wm_delete_window = ffi::XInternAtom(display, let mut wm_delete_window = ffi::XInternAtom(display,
"WM_DELETE_WINDOW".to_c_str().as_ptr() as *const libc::c_char, 0); "WM_DELETE_WINDOW".to_c_str().as_ptr() as *const libc::c_char, 0);
ffi::XSetWMProtocols(display, window, &mut wm_delete_window, 1); ffi::XSetWMProtocols(display, window, &mut wm_delete_window, 1);
ffi::XStoreName(display, window, mem::transmute(builder.title.as_slice().as_ptr())); let c_title = builder.title.to_c_str();
ffi::XStoreName(display, window, c_title.as_ptr());
ffi::XFlush(display); ffi::XFlush(display);
wm_delete_window wm_delete_window
@ -277,9 +278,10 @@ impl Window {
} }
pub fn set_title(&self, title: &str) { pub fn set_title(&self, title: &str) {
let c_title = title.to_c_str();
unsafe { unsafe {
ffi::XStoreName(self.display, self.window, ffi::XStoreName(self.display, self.window, c_title.as_ptr());
mem::transmute(title.as_slice().as_ptr())); ffi::XFlush(self.display);
} }
} }