From 1123fca3f285e11e2dfa966c6a74d39ad8e6dbc0 Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Mon, 27 Sep 2010 20:10:35 +0200
Subject: mutter-window: Add error traps check_needs_reshape

A window might change its shape and close immediately and thus causing
XShapeGetRectangles to produce a BadWindow, use an error trap
to avoid that.
---
 src/compositor/mutter-window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/compositor/mutter-window.c b/src/compositor/mutter-window.c
index 299566ea1..012d818db 100644
--- a/src/compositor/mutter-window.c
+++ b/src/compositor/mutter-window.c
@@ -1712,6 +1712,8 @@ static void
 check_needs_reshape (MutterWindow *self)
 {
   MutterWindowPrivate *priv = self->priv;
+  MetaScreen *screen = priv->screen;
+  MetaDisplay *display = meta_screen_get_display (screen);
 
   if (!priv->needs_reshape)
     return;
@@ -1722,15 +1724,17 @@ check_needs_reshape (MutterWindow *self)
 #ifdef HAVE_SHAPE
   if (priv->shaped)
     {
-      Display *xdisplay = meta_display_get_xdisplay (meta_window_get_display (priv->window));
+      Display *xdisplay = meta_display_get_xdisplay (display);
       XRectangle *rects;
       int n_rects, ordering;
 
+      meta_error_trap_push (display);
       rects = XShapeGetRectangles (xdisplay,
                                    priv->xwindow,
                                    ShapeBounding,
                                    &n_rects,
                                    &ordering);
+      meta_error_trap_pop (display, TRUE);
 
       if (rects)
         {
-- 
cgit v1.2.1