more pthread debugging

1 files changed, 9 insertions, 5 deletions

diff --git a/rfbserver.c b/rfbserver.c
index 64fa670..2d68e08 100644
--- a/rfbserver.c
+++ b/rfbserver.c
@@ -260,7 +260,10 @@ rfbClientConnectionGone(cl)
      rfbClientPtr cl;
 {
     int i;
+
 #ifdef HAVE_PTHREADS
+    pthread_mutex_lock(&cl->updateMutex);
+    pthread_mutex_lock(&cl->outputMutex);
     pthread_mutex_lock(&rfbClientListMutex);
 #endif
 
@@ -289,10 +292,6 @@ rfbClientConnectionGone(cl)
     if (cl->next)
         cl->next->prev = cl->prev;
 
-#ifdef HAVE_PTHREADS
-    pthread_mutex_unlock(&rfbClientListMutex);
-#endif
-
     sraRgnDestroy(cl->modifiedRegion);
 
     rfbPrintStats(cl);
@@ -300,6 +299,10 @@ rfbClientConnectionGone(cl)
     if (cl->translateLookupTable) free(cl->translateLookupTable);
 
 #ifdef HAVE_PTHREADS
+    pthread_mutex_unlock(&rfbClientListMutex);
+#endif
+
+#ifdef HAVE_PTHREADS
     pthread_cond_destroy(&cl->updateCond);
     pthread_mutex_destroy(&cl->updateMutex);
     pthread_mutex_destroy(&cl->outputMutex);
@@ -839,8 +842,9 @@ rfbSendFramebufferUpdate(cl, updateRegion)
       if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged)
 	sendCursorShape = TRUE;
     } else {
-      if (!cl->screen->cursorIsDrawn)
+      if (!cl->screen->cursorIsDrawn) {
 	rfbDrawCursor(cl);
+      }
     }
    
     /*