dix: check if keybd->key is valid before getting the keyboard state.
For floating SDs, GetPairedDevice() returns the SD itself, hence keybd->key may be NULL. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
e0a451eb7c
commit
64e595d12e
|
@ -3969,7 +3969,7 @@ DeviceEnterLeaveEvent(
|
||||||
devEnterLeave->mode |= (sameScreen ? (ELFlagSameScreen << 4) : 0);
|
devEnterLeave->mode |= (sameScreen ? (ELFlagSameScreen << 4) : 0);
|
||||||
|
|
||||||
devEnterLeave->state = mouse->button->state & 0x1f00;
|
devEnterLeave->state = mouse->button->state & 0x1f00;
|
||||||
if (keybd)
|
if (keybd && keybd->key)
|
||||||
devEnterLeave->state |= XkbGrabStateFromRec(&keybd->key->xkbInfo->state);
|
devEnterLeave->state |= XkbGrabStateFromRec(&keybd->key->xkbInfo->state);
|
||||||
|
|
||||||
mskidx = mouse->id;
|
mskidx = mouse->id;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user