aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/ramdac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-16 15:34:33 +0000
committermarha <marha@users.sourceforge.net>2010-04-16 15:34:33 +0000
commit0b8629ada4293370d220bbb7e6c195c711baee7d (patch)
treea7774b45662db90282ae18b17eb3d8f77d8c746d /xorg-server/hw/xfree86/ramdac
parent8654ee514b4d79feec936501717a06892090d3b7 (diff)
downloadvcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.gz
vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.bz2
vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.zip
svn merge -r534:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/ramdac')
-rw-r--r--xorg-server/hw/xfree86/ramdac/xf86Cursor.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
index 7f23d9ef3..f5f087314 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
@@ -312,6 +312,7 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
xf86SetCursor(pScreen, NullCursor, x, y);
ScreenPriv->isUp = FALSE;
}
+ ScreenPriv->CurrentCursor = NullCursor;
return;
}