[metacity/gnome-3-18] compositor: don't destroy client_region on unmap

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 5ebbc1897f5806b6bc9310967bb859964d1bd9e4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Apr 17 18:18:08 2016 +0300

    compositor: don't destroy client_region on unmap

 src/compositor/compositor-xrender.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index 61ee1be..11bc528 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -1997,7 +1997,7 @@ free_win (MetaCompWindow *cw,
       cw->visible_region = None;
     }
 
-  if (cw->client_region)
+  if (cw->client_region && destroy)
     {
       XFixesDestroyRegion (xdisplay, cw->client_region);
       cw->client_region = None;
@@ -2078,6 +2078,12 @@ map_win (MetaDisplay *display,
       cw->mask_pixmap = None;
     }
 
+  if (cw->client_region)
+    {
+      XFixesDestroyRegion (xdisplay, cw->client_region);
+      cw->client_region = None;
+    }
+
   if (cw->shaded.back_pixmap)
     {
       XFreePixmap (xdisplay, cw->shaded.back_pixmap);