diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-05 12:37:17 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-05 12:37:17 +1030 |
| commit | 1f0075786fedde538a95e2f39681052e25021d88 (patch) | |
| tree | 206a310601d7604aba8d2ab6f25191b6bc076c86 /hw/xfree86/ramdac/xf86Cursor.c | |
| parent | 57aa5e908dc11d5d8c27ed705c526f1416c1e8ad (diff) | |
| parent | 12175b668a94e23994f724b366a691ec312cce69 (diff) | |
Merge branch 'master' into mpx
Conflicts:
configure.ac
dix/getevents.c
hw/xfree86/ramdac/xf86Cursor.c
mi/mipointer.c
xkb/xkbUtils.c
Diffstat (limited to 'hw/xfree86/ramdac/xf86Cursor.c')
| -rw-r--r-- | hw/xfree86/ramdac/xf86Cursor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 5a8509bdb..c968f185f 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -212,11 +212,12 @@ xf86CursorEnableDisableFBAccess( pScreen->devPrivates[xf86CursorScreenIndex].ptr; if (!enable && ScreenPriv->CurrentCursor != NullCursor) { - ScreenPriv->SavedCursor = ScreenPriv->CurrentCursor; + CursorPtr currentCursor = ScreenPriv->CurrentCursor; xf86CursorSetCursor(pDev, pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y); ScreenPriv->isUp = FALSE; ScreenPriv->SWCursor = TRUE; + ScreenPriv->SavedCursor = currentCursor; } if (ScreenPriv->EnableDisableFBAccess) |