[PATCH 2/2] Check dev->u.master if there is a custom event handler, too

[Pierre Willenbrock]

---
 mi/mieq.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/mi/mieq.c b/mi/mieq.c
index f050115..a17b07d 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -398,7 +398,9 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
         if (handler)
         {
             handler(DequeueScreen(dev)->myNum, event, dev);
-            if (master)
+            /* Check for the SD's master in case the device got detached
+             * during event processing */
+            if (master && dev->u.master)
                 handler(DequeueScreen(master)->myNum,
                         (InternalEvent*)masterEvents->event, master);
         } else
-- 
1.6.3.1


--------------060509070008070600020500--