projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e52333
)
destroy pixmap on disable, and dont error if it fails
author
Dana Jansens
<danakj@orodu.net>
Sun, 27 Jun 2010 18:25:19 +0000
(14:25 -0400)
committer
Dana Jansens
<danakj@orodu.net>
Sun, 27 Jun 2010 21:18:55 +0000
(17:18 -0400)
openbox/composite.c
patch
|
blob
|
history
diff --git
a/openbox/composite.c
b/openbox/composite.c
index 023bf51e2bfb9d69d22d8fd1084a8b7468f27285..6e4a4065d592487d245a61bfa71c18f3f73fd29b 100644
(file)
--- 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);
}
}