From 2446c474aae15bcaf31e4b799f94f21d515984d5 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 22 Apr 2010 13:02:12 +0000 Subject: svn merge -r541:HEAD "^/branches/released" . --- xorg-server/mi/mipointer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/mi/mipointer.c') diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c index e1f63be4e..1b33f82d5 100644 --- a/xorg-server/mi/mipointer.c +++ b/xorg-server/mi/mipointer.c @@ -497,14 +497,14 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) miPointerPtr pPointer; + if (!pDev || !pDev->coreEvents) + return; + pPointer = MIPOINTER(pDev); pScreen = pPointer->pScreen; if (!pScreen) return; /* called before ready */ - if (!pDev || !pDev->coreEvents) - return; - if (*x < 0 || *x >= pScreen->width || *y < 0 || *y >= pScreen->height) { pScreenPriv = GetScreenPrivate (pScreen); -- cgit v1.2.3