diff options
| -rw-r--r-- | mi/mipointer.c | 5 | ||||
| -rw-r--r-- | mi/misprite.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mi/mipointer.c b/mi/mipointer.c index be1895654..4358759cc 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -284,10 +284,11 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) static void miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) { + SetupScreen(pScreen); + if (!pDev->isMaster && pDev->u.master) return; - SetupScreen(pScreen); (*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen); xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey)); dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL); @@ -302,8 +303,8 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) miPointerPtr pPointer; BOOL changedScreen = FALSE; - pPointer = MIPOINTER(pDev); SetupScreen (pScreen); + pPointer = MIPOINTER(pDev); if (pPointer->pScreen != pScreen) { diff --git a/mi/misprite.c b/mi/misprite.c index da6fc5519..467fd8f3e 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -725,10 +725,10 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y) { miSpriteScreenPtr pScreenPriv; + miCursorInfoPtr pPointer; pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); - miCursorInfoPtr pPointer; if (!pDev->isMaster && !pDev->u.master) { |