From 25191648b8db87735a99243697f73036255c1eb6 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 14 May 2011 16:11:32 -0700 Subject: XQuartz: Don't call mieqEnqueue during server shutdown Found-by: GuardMalloc Signed-off-by: Jeremy Huddleston --- mi/mieq.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mi') diff --git a/mi/mieq.c b/mi/mieq.c index 236ffcc3b..031b11ab2 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -83,17 +83,17 @@ static EventQueueRec miEventQueue; #include static pthread_mutex_t miEventQueueMutex = PTHREAD_MUTEX_INITIALIZER; -extern BOOL serverInitComplete; -extern pthread_mutex_t serverInitCompleteMutex; -extern pthread_cond_t serverInitCompleteCond; +extern BOOL serverRunning; +extern pthread_mutex_t serverRunningMutex; +extern pthread_cond_t serverRunningCond; static inline void wait_for_server_init(void) { /* If the server hasn't finished initializing, wait for it... */ - if(!serverInitComplete) { - pthread_mutex_lock(&serverInitCompleteMutex); - while(!serverInitComplete) - pthread_cond_wait(&serverInitCompleteCond, &serverInitCompleteMutex); - pthread_mutex_unlock(&serverInitCompleteMutex); + if(!serverRunning) { + pthread_mutex_lock(&serverRunningMutex); + while(!serverRunning) + pthread_cond_wait(&serverRunningCond, &serverRunningMutex); + pthread_mutex_unlock(&serverRunningMutex); } } #endif -- cgit v1.2.3