From 9965174f4f09a7de00a9569607e96226208bc2ce Mon Sep 17 00:00:00 2001
From: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu, 16 Jul 2009 12:12:48 +0200
Subject: [PATCH] Check dev->u.master if there is a custom event handler, too

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 mi/mieq.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mi/mieq.c b/mi/mieq.c
index 562580200..f28a16d61 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -401,7 +401,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