From 6b09f66d8c6ebcee70382b5cca1ba82b68f20afa Mon Sep 17 00:00:00 2001
From: "Pierre-Loup A. Griffais" <pgriffais@nvidia.com>
Date: Fri, 2 Apr 2010 12:48:21 -0700
Subject: [PATCH] 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>
---
 hw/xfree86/ramdac/xf86Cursor.c | 1 +
 1 file changed, 1 insertion(+)

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;
     }