diff options
| -rw-r--r-- | src/glx/apple/apple_glx_surface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glx/apple/apple_glx_surface.c b/src/glx/apple/apple_glx_surface.c index d42fa3b3269..915520286b0 100644 --- a/src/glx/apple/apple_glx_surface.c +++ b/src/glx/apple/apple_glx_surface.c @@ -207,9 +207,6 @@ apple_glx_surface_destroy(unsigned int uid) d->types.surface.pending_destroy = true; d->release(d); - /* apple_glx_drawable_find_by_uid returns a locked drawable */ - d->unlock(d); - /* * We release 2 references to the surface. One was acquired by * the find, and the other was leftover from a context, or @@ -220,6 +217,9 @@ apple_glx_surface_destroy(unsigned int uid) * to actually destroy it when the pending_destroy is processed * by a glViewport callback (see apple_glx_context_update()). */ - d->destroy(d); + if (!d->destroy(d)) { + /* apple_glx_drawable_find_by_uid returns a locked drawable */ + d->unlock(d); + } } } |