From 78a3631d150033e0b5f9682349f1af06472cd0cc Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 12 Jan 2023 14:07:32 +0100
Subject: [PATCH] core: Wrap XMapWindow() request with error traps

Other X11 calls happening during the process of assigning a frame
to a window are already wrapped with error traps, wrap this as well
to avoid possible X11 errors.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2745>
---
 src/core/frame.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/frame.c b/src/core/frame.c
index 2f9ef82cc..a61d41de2 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -143,7 +143,9 @@ meta_window_set_frame_xwindow (MetaWindow *window,
                                             x11_display->atom__NET_WM_SYNC_REQUEST_COUNTER,
                                             TRUE);
 
+  meta_x11_error_trap_push (x11_display);
   XMapWindow (x11_display->xdisplay, frame->xwindow);
+  meta_x11_error_trap_pop (x11_display);
 
   /* Move keybindings to frame instead of window */
   meta_window_grab_keys (window);