1 files changed, 1 insertions, 1 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index 01da52a6c..c0020c3c3 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -325,7 +325,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     CHECKEVENT(original);
 
     /* ET_XQuartz has sdev == NULL */
-    if (!sdev || !sdev->u.master)
+    if (!sdev || IsMaster(sdev) || !sdev->u.master)
         return NULL;
 
 #if XFreeXDGA