Keep the first X11 error

robbert-vdh · robbert-vdh · commit ef86e56ac7c0 · 2022-03-07T18:17:50.000+01:00
diff --git a/src/gl/x11/errors.rs b/src/gl/x11/errors.rs
@@ -45,10 +45,13 @@ impl<'a> XErrorHandler<'a> {
             let err = *err;
 
             CURRENT_X11_ERROR.with(|mutex| match mutex.lock() {
-                Ok(mut current_error) => {
+                // If multiple errors occur, keep the first one since that's likely going to be the
+                // cause of the other errors
+                Ok(mut current_error) if current_error.is_none() => {
                     *current_error = Some(err);
                     0
                 }
+                Ok(_) => 0,
                 Err(e) => {
                     eprintln!(
                         "[FATAL] raw-gl-context: Failed to lock for X11 Error Handler: {:?}",

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,13 @@ impl<'a> XErrorHandler<'a> {`
`45`	`45`	`let err = *err;`
`46`	`46`
`47`	`47`	`CURRENT_X11_ERROR.with(\|mutex\| match mutex.lock() {`
`48`		`- Ok(mut current_error) => {`
	`48`	`+ // If multiple errors occur, keep the first one since that's likely going to be the`
	`49`	`+ // cause of the other errors`
	`50`	`+ Ok(mut current_error) if current_error.is_none() => {`
`49`	`51`	`*current_error = Some(err);`
`50`	`52`	`0`
`51`	`53`	`}`
	`54`	`+ Ok(_) => 0,`
`52`	`55`	`Err(e) => {`
`53`	`56`	`eprintln!(`
`54`	`57`	`"[FATAL] raw-gl-context: Failed to lock for X11 Error Handler: {:?}",`