Merge remote-tracking branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2014-07-24 16:51:00 -07:00
commit 556cdf8fe8

View File

@ -516,7 +516,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
verify_internal_event(event); verify_internal_event(event);
/* refuse events from disabled devices */ /* refuse events from disabled devices */
if (!dev->enabled) if (dev && !dev->enabled)
return; return;
/* Custom event handler */ /* Custom event handler */