From 294f3c369d251c72e89e28ceab64354714e6f25d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 29 Jul 2011 16:33:54 +1000 Subject: [PATCH] dix: don''t XWarpPointer through the last slave anymore (#38313) This line was introduced pre-1.6 to fix Bug 19297. The effect of warping through the VCP then was that if a device had custom valuator ranges, the warp position would be wrong. This has since been fixed otherwise and devices scale the last valuators properly to and fro. Warp through the VCP (or whichever master pointer was selected). This fixes a server crash where the lastSlave is a pointer device without valuators (Bug 38313#0). X.Org Bug 38313 Signed-off-by: Peter Hutterer --- dix/events.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dix/events.c b/dix/events.c index 25ff899..9efe8fb 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3446,8 +3446,6 @@ ProcWarpPointer(ClientPtr client) } } - if (dev->lastSlave) - dev = dev->lastSlave; pSprite = dev->spriteInfo->sprite; #ifdef PANORAMIX -- 1.7.6