(no commit message)

diff --git a/magick/xwindow.c b/magick/xwindow.c
index c4e000296b79d03322764e1c82de77803aec960b..3e8c655590acf3c2ab2c2943be295c66a04861d0 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -8734,6 +8734,14 @@ MagickExport void XRefreshWindow(Display *display,const XWindowInfo *window,
       width=window->width;
       height=window->height;
       while (XCheckTypedWindowEvent(display,window->id,Expose,&sans_event)) ;
+      if (window->matte_pixmap != (Pixmap) NULL)
+        {
+#if defined(MAGICKCORE_HAVE_SHAPE)
+          if (window->shape != MagickFalse)
+            XShapeCombineMask(display,window->id,ShapeBounding,0,0,
+              window->matte_pixmap,ShapeSet);
+#endif
+        }
     }
   /*
     Check boundary conditions.
@@ -8746,15 +8754,7 @@ MagickExport void XRefreshWindow(Display *display,const XWindowInfo *window,
     Refresh image.
   */
   if (window->matte_pixmap != (Pixmap) NULL)
-    {
-#if defined(MAGICKCORE_HAVE_SHAPE)
-      if (window->shape != MagickFalse)
-        XShapeCombineMask(display,window->id,ShapeBounding,0,0,
-          window->matte_pixmap,ShapeSet);
-#endif
-      (void) XSetClipMask(display,window->annotate_context,
-        window->matte_pixmap);
-    }
+    (void) XSetClipMask(display,window->annotate_context,window->matte_pixmap);
   if (window->pixmap != (Pixmap) NULL)
     {
       if (window->depth > 1)