2008-04-1 Robert Bragg <bob@o-hand.com>

* clutter/glx/clutter-glx-texture-pixmap.c:
	In clutter_glx_texture_pixmap_dispose; trap X errors around
	glXDestroyGLXPixmap so we can't die due to BadDrawable errors.
This commit is contained in:
Robert Bragg 2008-04-01 13:36:19 +00:00
parent 244eedb5bd
commit d04fd6d620
2 changed files with 9 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2008-04-1 Robert Bragg <bob@o-hand.com>
* clutter/glx/clutter-glx-texture-pixmap.c:
In clutter_glx_texture_pixmap_dispose; trap X errors around
glXDestroyGLXPixmap so we can't die due to BadDrawable errors.
2008-03-31 Matthew Allum <mallum@openedhand.com> 2008-03-31 Matthew Allum <mallum@openedhand.com>
* README: * README:

View File

@ -162,8 +162,11 @@ clutter_glx_texture_pixmap_dispose (GObject *object)
if (priv->glx_pixmap != None) if (priv->glx_pixmap != None)
{ {
clutter_x11_trap_x_errors ();
glXDestroyGLXPixmap (((ClutterBackendX11 *)backend)->xdpy, glXDestroyGLXPixmap (((ClutterBackendX11 *)backend)->xdpy,
priv->glx_pixmap); priv->glx_pixmap);
XSync (((ClutterBackendX11 *)backend)->xdpy, FALSE);
clutter_x11_untrap_x_errors ();
priv->glx_pixmap = None; priv->glx_pixmap = None;
} }