summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-04-18 01:01:44 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2012-04-26 21:07:08 -0700
commit8a48d44574375ba4fa85c5a59678998811ea4e80 (patch)
treefd2e1f2676959be0f41672955932517709c95774
parent9ef48c9ffff6704dbe7c976d86527f22b0e1d114 (diff)
XQuartz: Fix a deadlock in pre-dispatch code
The fact that this has been in place so long makes me really wonder if anybody cares about this running in Tiger or Leopard. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit b4c4c65a35640e7274ccd4228f62110147878b72)
-rw-r--r--hw/xquartz/xpr/xprFrame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
index 4c7aac42b..01f1def20 100644
--- a/hw/xquartz/xpr/xprFrame.c
+++ b/hw/xquartz/xpr/xprFrame.c
@@ -212,7 +212,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
#else
pthread_rwlock_wrlock(&window_hash_rwlock);
x_hash_table_insert(window_hash, pFrame->wid, pFrame);
- pthread_rwlock_wrlock(&window_hash_rwlock);
+ pthread_rwlock_unlock(&window_hash_rwlock);
#endif
xprSetNativeProperty(pFrame);