Merge remote-tracking branch 'jeremyhu/master'

2014-07-24 16:51:00 -07:00 · 2014-07-24 16:51:00 -07:00 · 556cdf8fe8
commit 556cdf8fe8
parent 83701c4ee8 1faa766705
1 changed files with 1 additions and 1 deletions
--- a/mi/mieq.c
+++ b/mi/mieq.c
@ -516,7 +516,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
    verify_internal_event(event);

    /* refuse events from disabled devices */
-    if (!dev->enabled)
+    if (dev && !dev->enabled)
        return;

    /* Custom event handler */