From 0ba526deeb4d54ee1a75400291ee7a3673ed4d96 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Feb 2011 12:04:46 +1000 Subject: mi: check for MASTER_POINTER instead of manual checks. Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- mi/mipointer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mi/mipointer.c') diff --git a/mi/mipointer.c b/mi/mipointer.c index 5b8297880..209ea06be 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -540,7 +540,7 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen, * VCP, as this may cause a non-HW rendered cursor to be rendered during * SIGIO. This again leads to allocs during SIGIO which leads to SIGABRT. */ - if ((pDev == inputInfo.pointer || (!IsMaster(pDev) && pDev->u.master == inputInfo.pointer)) + if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer && !pScreenPriv->waitForUpdate && pScreen == pPointer->pSpriteScreen) { pPointer->devx = x; -- cgit v1.2.3