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/devices.c | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index f419a98fd..e65e5598e 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -920,6 +920,10 @@ CloseDownDevices(void)
     {
         if (!IsMaster(dev) && dev->u.master)
             dev->u.master = NULL;
+        /* Initialise the sprite and paired members of all devices
+           to avoid crashes in CloseDevice later */
+        dev->spriteInfo->sprite=NULL;
+        dev->spriteInfo->paired=NULL;
     }
 
     CloseDeviceList(&inputInfo.devices);
-- 
cgit v1.2.3