summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-07-10 13:56:38 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-07-10 19:11:30 +0930
commitffdf8f3e452638e6b050fccabee465d6c0300f45 (patch)
treed2b83762331f5a590987b29437e8f0ac2803d634 /dix
parent583e988b9f7cfb9293144c8309023c0dd1766715 (diff)
DeliverEventsToWindow: ensure that genericMask has a defined value.
Diffstat (limited to 'dix')
-rw-r--r--dix/events.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/dix/events.c b/dix/events.c
index 097ebba69..7de8d2ea6 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2020,9 +2020,8 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
/* get the XGE event mask.
* FIXME: needs to be freed somewhere too.
*/
- if (!pWin->optional || !pWin->optional->geMasks)
- tempGrab.genericMasks = NULL;
- else
+ tempGrab.genericMasks = NULL;
+ if (pWin->optional && pWin->optional->geMasks)
{
GenericClientMasksPtr gemasks = pWin->optional->geMasks;
GenericMaskPtr geclient = gemasks->geClients;