[Xfce4-commits] [xfce/xfwm4] 04/05: Free wireframe window at last

[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 a754a8e14c362b4f57c86bf3e57e6f897f143c97
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Thu Jan 29 21:51:02 2015 +0100

    Free wireframe window at last
    
    to avoid X errors.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/wireframe.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/wireframe.c b/src/wireframe.c
index bb70a2f..e2611f2 100644
--- a/src/wireframe.c
+++ b/src/wireframe.c
@@ -288,11 +288,6 @@ wireframeDelete (WireFrame *wireframe)
 
     screen_info = wireframe->screen_info;
     XUnmapWindow (myScreenGetXDisplay (screen_info), wireframe->xwindow);
-    XDestroyWindow (myScreenGetXDisplay (screen_info), wireframe->xwindow);
-    if (wireframe->xcolormap != screen_info->cmap)
-    {
-        XFreeColormap (myScreenGetXDisplay (screen_info), wireframe->xcolormap);
-    }
     if (wireframe->cr)
     {
         cairo_destroy (wireframe->cr);
@@ -301,5 +296,10 @@ wireframeDelete (WireFrame *wireframe)
     {
         cairo_surface_destroy (wireframe->surface);
     }
+    if (wireframe->xcolormap != screen_info->cmap)
+    {
+        XFreeColormap (myScreenGetXDisplay (screen_info), wireframe->xcolormap);
+    }
+    XDestroyWindow (myScreenGetXDisplay (screen_info), wireframe->xwindow);
     g_free (wireframe);
 }

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