diff options
author | Pierre-Loup A. Griffais <pgriffais@nvidia.com> | 2010-04-02 12:48:21 -0700 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-09 09:46:50 +1000 |
commit | 2350035463bcfb6d80249b55ce392a154a8d91da (patch) | |
tree | baae4f53c057fda289efbe3b674ec9c9c689add3 | |
parent | 2297ad916a15a116e92f2549f59b222449f08b89 (diff) |
Don't keep a pointer to a possibly freed cursor when changing screens, preventing a crash in xf86CursorEnableDisableFBAccess() trying to restore it.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 6b09f66d8c6ebcee70382b5cca1ba82b68f20afa)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | hw/xfree86/ramdac/xf86Cursor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 7f23d9ef3..f5f087314 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/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; } |