From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 Jun 2010 20:06:03 +0000 (-0400)
Subject: destroy the glxpixmap before the xpixmap it was made from to avoid a segfault in... 
X-Git-Tag: cgl~47
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=db3fcc5c361233d53c465bea2a81a85fcb78fccc;p=dana%2Fopenbox.git

destroy the glxpixmap before the xpixmap it was made from to avoid a segfault in some gl drivers
---

diff --git a/openbox/event.c b/openbox/event.c
index a1fbcf6c..5198ff72 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -656,14 +656,14 @@ static void event_process(const XEvent *ec, gpointer data)
         }
 
         if (pixchange) {
-            if (obwin->pixmap != None) {
-                XFreePixmap(obt_display, obwin->pixmap);
-                obwin->pixmap = None;
-            }
             if (obwin->gpixmap != None) {
                 glXDestroyGLXPixmap(obt_display, obwin->gpixmap);
                 obwin->gpixmap = None;
             }
+            if (obwin->pixmap != None) {
+                XFreePixmap(obt_display, obwin->pixmap);
+                obwin->pixmap = None;
+            }
         }
     } else if ((e->type == UnmapNotify) && obwin &&
                obwin->type != OB_WINDOW_CLASS_PROMPT &&