svn merge ^/branches/released .

1 files changed, 5 insertions, 1 deletions

diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c
index 5e15c956a..88bf5163e 100644
--- a/xorg-server/record/record.c
+++ b/xorg-server/record/record.c
@@ -77,6 +77,7 @@ typedef struct {
     char	bufCategory;	   /* category of protocol in replyBuffer */

     int		numBufBytes;	   /* number of bytes in replyBuffer */

     char	replyBuffer[REPLY_BUF_SIZE]; /* buffered recorded protocol */

+    int		inFlush;           /*  are we inside RecordFlushReplyBuffer */

 } RecordContextRec, *RecordContextPtr;

 

 /*  RecordMinorOpRec - to hold minor opcode selections for extension requests

@@ -245,8 +246,9 @@ RecordFlushReplyBuffer(
     int len2

 )

 {

-    if (!pContext->pRecordingClient || pContext->pRecordingClient->clientGone) 

+    if (!pContext->pRecordingClient || pContext->pRecordingClient->clientGone || pContext->inFlush)

 	return;

+    ++pContext->inFlush;

     if (pContext->numBufBytes)

 	WriteToClient(pContext->pRecordingClient, pContext->numBufBytes,

 		      (char *)pContext->replyBuffer);

@@ -255,6 +257,7 @@ RecordFlushReplyBuffer(
 	WriteToClient(pContext->pRecordingClient, len1, (char *)data1);

     if (len2)

 	WriteToClient(pContext->pRecordingClient, len2, (char *)data2);

+    --pContext->inFlush;

 } /* RecordFlushReplyBuffer */

 

 

@@ -1938,6 +1941,7 @@ ProcRecordCreateContext(ClientPtr client)
     pContext->numBufBytes = 0;

     pContext->pBufClient = NULL;

     pContext->continuedReply = 0;

+    pContext->inFlush = 0;

 

     err = RecordRegisterClients(pContext, client,

 				(xRecordRegisterClientsReq *)stuff);