summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-06-21 10:54:02 -0700
committerJamey Sharp <jamey@minilop.net>2010-06-21 10:54:02 -0700
commit4a8b6528ff69f6feb8c0e119939b4ce6c088f29e (patch)
tree488fd82e25bab66911188ef3c1c30e4afa1ec720
parentc115095d7f2bc4f5a4fb26380e3698fefdad7611 (diff)
xcb_io.c: poll_for_response doesn't guarantee there's a pending request.
Fixes the second bug reported in: https://bugs.freedesktop.org/show_bug.cgi?id=28595 Signed-off-by: Jamey Sharp <jamey@minilop.net>
-rw-r--r--src/xcb_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xcb_io.c b/src/xcb_io.c
index 0350bb2d..022f5c49 100644
--- a/src/xcb_io.c
+++ b/src/xcb_io.c
@@ -362,7 +362,7 @@ void _XReadEvents(Display *dpy)
response = poll_for_response(dpy);
if(response)
handle_response(dpy, response, False);
- else if(dpy->xcb->pending_requests->reply_waiter)
+ else if(dpy->xcb->pending_requests && dpy->xcb->pending_requests->reply_waiter)
{ /* need braces around ConditionWait */
ConditionWait(dpy, dpy->xcb->reply_notify);
}