summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-02 11:00:14 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-02 11:00:14 +0930
commit334456952930cb3e55c02fcdada2d0c074cd0520 (patch)
treedccc78d08cf18c68dfe38b498808f60da807c366 /Xi
parent8e56fd9728d63a7a48ef44503425c6e25c7c9ffb (diff)
parent3b8d53452cd6c74d32d7759964a7cd9ee775f161 (diff)
Merge branch 'master' into mpx
Conflicts: Xi/exevents.c dix/devices.c
Diffstat (limited to 'Xi')
-rw-r--r--Xi/exevents.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index d0c10d9da..b2845473a 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -2140,6 +2140,8 @@ SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
for (i = 0; i < screenInfo.numScreens; i++) {
pWin = WindowTable[i];
+ if (!pWin)
+ continue;
(void)DeliverEventsToWindow(dev, pWin, ev, count, mask, NullGrab, dev->id);
p1 = pWin->firstChild;
FindInterestedChildren(dev, p1, mask, ev, count);