diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-05-10 18:56:50 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-05-16 18:59:28 -0700 |
| commit | 60fa18b90fef1c67f52d610abed0d2ac39238deb (patch) | |
| tree | 5d1ac4b30e02ee864da0d58006e95dadb941d309 | |
| parent | 62058968e71352083fc4513e3d6068116ecf99ba (diff) | |
darwin: Unlock our mutex before destroying it
http://xquartz.macosforge.org/trac/ticket/575
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit a73a800b3200d21c32fac9f28e2f86919bc0a2ba)
| -rw-r--r-- | src/glx/apple/apple_glx_drawable.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glx/apple/apple_glx_drawable.c b/src/glx/apple/apple_glx_drawable.c index db283023a63..aaa27741d38 100644 --- a/src/glx/apple/apple_glx_drawable.c +++ b/src/glx/apple/apple_glx_drawable.c @@ -173,6 +173,9 @@ destroy_drawable(struct apple_glx_drawable *d) apple_glx_diagnostic("%s: freeing %p\n", __func__, (void *) d); + /* Stupid recursive locks */ + while (pthread_mutex_unlock(&d->mutex) == 0); + err = pthread_mutex_destroy(&d->mutex); if (err) { fprintf(stderr, "pthread_mutex_destroy error: %s\n", strerror(err)); |