From: Dana Jansens <danakj@orodu.net>
Date: Sun, 27 Jun 2010 18:25:19 +0000 (-0400)
Subject: destroy pixmap on disable, and dont error if it fails
X-Git-Tag: cgl~3
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=46c0ba29716d7caa11df15727aada4a845d6c03c;p=dana%2Fopenbox.git

destroy pixmap on disable, and dont error if it fails
---

diff --git a/openbox/composite.c b/openbox/composite.c
index 023bf51e..6e4a4065 100644
--- a/openbox/composite.c
+++ b/openbox/composite.c
@@ -215,11 +215,13 @@ static gboolean bind_glx_pixmap(GLXPixmap gpx, GLuint tex)
 static void destroy_glx_pixmap(GLXPixmap gpx, GLuint tex)
 {
     if (gpx) {
+        obt_display_ignore_errors(TRUE);
         if (tex) {
             glBindTexture(GL_TEXTURE_2D, tex);
             glXReleaseTexImageEXT(obt_display, gpx, GLX_FRONT_LEFT_EXT);
         }
         glXDestroyPixmap(obt_display, gpx);
+        obt_display_ignore_errors(FALSE);
     }
 }