dix: avoid activating the VCP/VCK twice.

This may set dev->key-xkbinfo to NULL, causing a segfault in xkb code lateron.
Spotted by David Huggins-Daines.
This commit is contained in:
Peter Hutterer 2007-11-30 11:34:24 +10:30
parent 9eb8ea9e61
commit 6216abe0c1

View File

@ -572,9 +572,6 @@ InitCoreDevices(void)
if (!AllocateDevicePrivate(inputInfo.pointer, CoreDevicePrivatesIndex))
FatalError("Couldn't allocate pointer devPrivates\n");
inputInfo.pointer->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
ActivateDevice(inputInfo.keyboard);
ActivateDevice(inputInfo.pointer);
}
/**