[Xfce4-commits] [xfce/xfwm4] 01/04: Fix window preview disappearing on themes reload

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 7a207409659a4d612dd8448773f6d799ad32f392
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Feb 18 08:49:18 2015 +0100

    Fix window preview disappearing on themes reload
    
    Again.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/compositor.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 5640d3c..87383fa 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -746,12 +746,6 @@ free_win_data (CWindow *cw, gboolean delete)
     }
 #endif
 
-    if (cw->saved_picture)
-    {
-        XRenderFreePicture (display_info->dpy, cw->saved_picture);
-        cw->saved_picture = None;
-    }
-
     if (cw->picture)
     {
         if (delete)
@@ -760,6 +754,10 @@ free_win_data (CWindow *cw, gboolean delete)
         }
         else
         {
+            if (cw->saved_picture)
+            {
+                XRenderFreePicture (display_info->dpy, cw->saved_picture);
+            }
             cw->saved_picture = cw->picture;
         }
         cw->picture = None;
@@ -815,6 +813,13 @@ free_win_data (CWindow *cw, gboolean delete)
 
     if (delete)
     {
+        /* No need to keep this around */
+        if (cw->saved_picture)
+        {
+            XRenderFreePicture (display_info->dpy, cw->saved_picture);
+            cw->saved_picture = None;
+        }
+
         if (cw->damage)
         {
             /* The damage may be already destroyed along with the attached resource,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.