summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-02-18 12:04:46 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-02-22 14:35:45 +1000
commit0ba526deeb4d54ee1a75400291ee7a3673ed4d96 (patch)
treee476d7ee8b8f4c07ba60d64ef975662070df0eba
parent52c13896ce9a1e178d4eeed15f68020947cc20ed (diff)
mi: check for MASTER_POINTER instead of manual checks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
-rw-r--r--mi/mipointer.c2
1 files changed, 1 insertions, 1 deletions
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;