migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 07:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

On X11, fix errors bleeding from hooks handling them

Browse Source 
This commit fixes it, by not updating the `latest_error` when
any of the hooks handled the error, otherwise it'd interfere
with the winit's error checking.
This commit is contained in:
Kirill Chibisov
2023-01-18 05:58:09 +03:00
committed by GitHub
parent a88d2e079d
commit b1a5fae1f5
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform_impl/linux/mod.rs
View File

@@ -653,9 +653,9 @@ unsafe extern "C" fn x_error_callback(
// Don't log error.
if !error_handled {
error!("X11 error: {:#?}", error);
// XXX only update the error, if it wasn't handled by any of the hooks.
*xconn.latest_error.lock().unwrap() = Some(error);
}
*xconn.latest_error.lock().unwrap() = Some(error);
}
// Fun fact: this return value is completely ignored.
0