summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
Diffstat (limited to 'dix')
-rw-r--r--dix/dispatch.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 28a3c3f5f..7eb200dc4 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -151,7 +151,6 @@ static ClientPtr grabClient;
#define GrabNone 0
#define GrabActive 1
-#define GrabKickout 2
static int grabState = GrabNone;
static long grabWaiters[mskcnt];
CallbackListPtr ServerGrabCallback = NULL;
@@ -375,11 +374,6 @@ Dispatch(void)
/* KillClient can cause this to happen */
continue;
}
- /* GrabServer activation can cause this to be true */
- if (grabState == GrabKickout) {
- grabState = GrabActive;
- break;
- }
isItTimeToYield = FALSE;
start_tick = SmartScheduleTime;
@@ -1059,7 +1053,7 @@ ProcGrabServer(ClientPtr client)
rc = OnlyListenToOneClient(client);
if (rc != Success)
return rc;
- grabState = GrabKickout;
+ grabState = GrabActive;
grabClient = client;
if (ServerGrabCallback) {