frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: close virtual core devices after other devices. 

If a device is paired with the VCP, deleting the VCP before the device will
segfault the server when the sprite should get updated.
This commit is contained in:
Peter Hutterer 2007-09-06 17:27:28 +09:30
parent 03680a384a
commit 49dbe9a757
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/devices.c
View File

@ -712,9 +712,6 @@ CloseDownDevices(void)
{ {
DeviceIntPtr dev, next; DeviceIntPtr dev, next;
CloseDevice(inputInfo.keyboard);
CloseDevice(inputInfo.pointer);
for (dev = inputInfo.devices; dev; dev = next) for (dev = inputInfo.devices; dev; dev = next)
{ {
next = dev->next; next = dev->next;
@ -725,6 +722,10 @@ CloseDownDevices(void)
next = dev->next; next = dev->next;
CloseDevice(dev); CloseDevice(dev);
} }
CloseDevice(inputInfo.keyboard);
CloseDevice(inputInfo.pointer);
inputInfo.devices = NULL; inputInfo.devices = NULL;
inputInfo.off_devices = NULL; inputInfo.off_devices = NULL;
inputInfo.keyboard = NULL; inputInfo.keyboard = NULL;