unredirect on a window with bad timing can cause a BadValue error

exemplified by right clicking on wbar a lot causing it to remap itself

diff --git a/openbox/composite.c b/openbox/composite.c
index ea8fbca..6e52ead 100644 (file)
--- a/openbox/composite.c
+++ b/openbox/composite.c
@@ -649,8 +649,11 @@ static void composite_window_unredir(ObWindow *w)
 {
     if (!w->redir) return;
 
+    /* this call can cause a BadValue error */
+    obt_display_ignore_errors(TRUE);
     XCompositeUnredirectWindow(obt_display, window_redir(w),
                                CompositeRedirectManual);
+    obt_display_ignore_errors(FALSE);
     w->is_redir = FALSE;
 }