From a8abf2e386861592ef6252451eebbeef9e8e40e6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 18 May 2010 15:49:32 +0000
Subject: Solved crash in closing down

---
 xorg-server/dix/events.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'xorg-server/dix/events.c')

diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 22bb99557..7d8c1493f 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -2746,6 +2746,9 @@ CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev)
 
     CHECKEVENT(ev);
 
+    if (!pSprite)
+      return FALSE;
+
     prevSpriteWin = pSprite->win;
 
     if (ev && !syncEvents.playingEvents)
@@ -3152,7 +3155,7 @@ NewCurrentScreen(DeviceIntPtr pDev, ScreenPtr newScreen, int x, int y)
 	}
     } else
 #endif
-    if (newScreen != pSprite->hotPhys.pScreen)
+    if (newScreen != pSprite->hotPhys.pScreen && WindowTable[newScreen->myNum])
 	ConfineCursorToWindow(pDev, WindowTable[newScreen->myNum],
                 TRUE, FALSE);
 }
-- 
cgit v1.2.3