summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 17:08:12 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 23:31:07 -0700
commit226b1033b48807fd6871ba626e20ef1411904939 (patch)
tree7f6574b1ab5be11c988b0db44103a06ce750b47a /mi
parent0c2731596f27f2cdf5000ba41de37e7eb86ad6f9 (diff)
XQuartz: Transition from xEvent based mieq to InternalEvent
(cherry picked from commit a3dbde2de87ee4f577748a8c447501a3ea462559)
Diffstat (limited to 'mi')
-rw-r--r--mi/mieq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index 4c6c3bdc6..9b6d0c901 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -323,7 +323,8 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
CHECKEVENT(original);
- if (!sdev->u.master)
+ /* ET_XQuartz has sdev == NULL */
+ if (!sdev || !sdev->u.master)
return NULL;
switch(original->any.type)