Xi: finish XKB initialisation before copying the keymap.

This commit is contained in:
Peter Hutterer 2008-02-07 21:22:50 +10:30
parent 96eafa3d4f
commit 9d5edebe96

View File

@ -184,7 +184,10 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
#ifdef XKB
if (!noXkbExtension && dk->xkbInfo && dk->xkbInfo->desc) {
if (!mk->xkbInfo || !mk->xkbInfo->desc)
{
XkbInitDevice(master);
XkbFinishDeviceInit(master);
}
if (!XkbCopyKeymap(dk->xkbInfo->desc, mk->xkbInfo->desc, True))
FatalError("Couldn't pivot keymap from device to core!\n");
}