xserver: Branch 'master'

[Peter Hutterer]

 dix/getevents.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 465a9bb96e8a90e53e655b3245e22910201786d7
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Fri Aug 8 17:37:06 2008 +0930

    dix: don't try to create events if we don't have a screen. #16898
    
    A NULL screen may happen during server shutdown, when the output has been shut
    down but the devices still generate events.
    
    X.Org Bug 16898 <http://bugs.freedesktop.org/show_bug.cgi?id=16898>

diff --git a/dix/getevents.c b/dix/getevents.c
index 61252c3..718b8ff 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -814,6 +814,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
     ms = GetTimeInMillis(); /* before pointer update to help precision */
 
     /* Sanity checks. */
+    if (!scr) /* can happen during server shutdown */
+        return 0;
     if (type != MotionNotify && type != ButtonPress && type != ButtonRelease)
         return 0;
     if (type != MotionNotify && !pDev->button)