xf86-video-intel: src/sna/sna_dri2.c

[Chris Wilson]

 src/sna/sna_dri2.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 21cc987ca8a531e399350564a5af7f551406b8d6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 1 07:19:09 2014 +0100

    sna: Only decouple the event once
    
    If the client and drawable destroys are racing, we may trigger the event
    removal twice.
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=83183
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 94bfcda..61917cf 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1392,7 +1392,9 @@ sna_dri2_client_gone(CallbackListPtr *list, void *closure, void *data)
 		assert(event->client == client);
 
 		if (event->queued) {
-			sna_dri2_remove_event((WindowPtr)event->draw, event);
+			if (event->draw)
+				sna_dri2_remove_event((WindowPtr)event->draw,
+						      event);
 			event->client = NULL;
 			event->draw = NULL;
 			list_del(&event->link);