aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/devices.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-08 11:23:34 +0000
committermarha <marha@users.sourceforge.net>2009-12-08 11:23:34 +0000
commit75d2bbcf0f39b9c85bc270728343f61dabebce2d (patch)
treecc3c92e0383bc1ed885d25290167c46b1f9edb15 /xorg-server/dix/devices.c
parent3e1ba549192a68801232c28a9c12defb59531654 (diff)
downloadvcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.tar.gz
vcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.tar.bz2
vcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.zip
Git update 8/12/2009
Diffstat (limited to 'xorg-server/dix/devices.c')
-rw-r--r--xorg-server/dix/devices.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 3634eece0..6329d2810 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -686,7 +686,6 @@ FreeDeviceClass(int type, pointer *class)
{
ValuatorClassPtr *v = (ValuatorClassPtr*)class;
- /* Counterpart to 'biggest hack ever' in init. */
if ((*v)->motion)
xfree((*v)->motion);
xfree((*v));
@@ -908,6 +907,9 @@ CloseDownDevices(void)
DeleteInputDeviceRequest(dev);
}
+ CloseDevice(inputInfo.pointer);
+ CloseDevice(inputInfo.keyboard);
+
inputInfo.devices = NULL;
inputInfo.off_devices = NULL;
inputInfo.keyboard = NULL;