diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/mi/mipointer.c | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/mi/mipointer.c')
| -rw-r--r-- | xorg-server/mi/mipointer.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |