From ffdf8f3e452638e6b050fccabee465d6c0300f45 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 10 Jul 2007 13:56:38 +0930
Subject: [PATCH] DeliverEventsToWindow: ensure that genericMask has a defined
 value.

---
 autogen.sh   | 2 +-
 dix/events.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 66acd288d..54e9f337d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,4 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode --disable-dmx --enable-kdrive "$@"
+$srcdir/configure --enable-maintainer-mode --disable-dmx --enable-dri --enable-kdrive "$@"
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;