migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-31 13:50:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #700 from ecoal95/querydevice-leak

Browse Source 
x11: Prevent leak on XIQueryDevice
This commit is contained in:
tomaka
2016-01-07 15:44:43 +01:00
parent 64dbf51105 21b9245ccc
commit 88e64a87a9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/x11/input.rs
View File

@@ -226,7 +226,7 @@ impl XInputEventHandler {
for axis_id in 0..axis_state.mask_len { for axis_id in 0..axis_state.mask_len {
if ffi::XIMaskIsSet(&mask, axis_id) { if ffi::XIMaskIsSet(&mask, axis_id) {
let axis_value = unsafe{*axis_state.values.offset(axis_count)}; let axis_value = unsafe{*axis_state.values.offset(axis_count)};
let delta = calc_scroll_deltas(event_data, axis_id, axis_value, &self.axis_list, let delta = calc_scroll_deltas(event_data, axis_id, axis_value, &self.axis_list,
&mut self.current_state.axis_values); &mut self.current_state.axis_values);
scroll_delta.0 += delta.0; scroll_delta.0 += delta.0;
scroll_delta.1 += delta.1; scroll_delta.1 += delta.1;
@@ -314,7 +314,11 @@ fn read_input_axis_info(display: &Arc<XConnection>) -> Vec<Axis> {
} }
} }
} }
unsafe {
(display.xinput2.XIFreeDeviceInfo)(devices);
}
axis_list axis_list
} }