aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-07-01 07:14:24 +0000
committermarha <marha@users.sourceforge.net>2010-07-01 07:14:24 +0000
commit1faa0f175bda9074b5f45e5e005d9a80721e3c24 (patch)
tree3a1c33cb65654d1a65979618dedf732b9ea11819 /xorg-server/os
parentaf64ef0fd32e87e56c5b293eaef39f3b9791bfbb (diff)
parent87559ccfc67a98a75fa8068066871c35caa88e30 (diff)
downloadvcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.gz
vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.bz2
vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/os')
-rw-r--r--xorg-server/os/connection.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index 5cbca81bd..bec7b1b23 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -1175,6 +1175,10 @@ IgnoreClient (ClientPtr client)
OsCommPtr oc = (OsCommPtr)client->osPrivate;
int connection = oc->fd;
+ client->ignoreCount++;
+ if (client->ignoreCount > 1)
+ return;
+
isItTimeToYield = TRUE;
if (!GrabInProgress || FD_ISSET(connection, &AllClients))
{
@@ -1209,6 +1213,11 @@ AttendClient (ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
int connection = oc->fd;
+
+ client->ignoreCount--;
+ if (client->ignoreCount)
+ return;
+
if (!GrabInProgress || GrabInProgress == client->index ||
FD_ISSET(connection, &GrabImperviousClients))
{