diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-10 07:43:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-10 07:43:34 +0000 |
| commit | 0540eb5a1f795c0f5265d244ec979b8ddfcf3acb (patch) | |
| tree | 06c5c3f4394f2d6d48c95ed1bfbab3a44e9996cc /xorg-server/dix/devices.c | |
| parent | 5c72c54bc068bf12007dc15b353b1b2795e9aaf5 (diff) | |
| parent | 75d2bbcf0f39b9c85bc270728343f61dabebce2d (diff) | |
| download | vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.gz vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.bz2 vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.zip | |
svn merge ^/trunk .
Diffstat (limited to 'xorg-server/dix/devices.c')
| -rw-r--r-- | xorg-server/dix/devices.c | 4 |
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; |