summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-06-21 13:34:15 -0700
committerJamey Sharp <jamey@minilop.net>2010-06-21 13:34:15 -0700
commitef67486c5a8aada24fd95b2991a3c4979f53805f (patch)
treeb317a5f2560d9a2f34ed413b80ce3b6a0cc78d46
parent301ec5b41e9d253a446db656e1789ac7345dc433 (diff)
Revert "xcb_io.c: poll_for_response doesn't guarantee there's a pending request."
This reverts commit 4a8b6528ff69f6feb8c0e119939b4ce6c088f29e, because as a matter of fact, if poll_for_response returns NULL when we know dpy->xcb->next_event is non-NULL, there *is* guaranteed to be a pending request.
-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 b246fb9f..dac7622c 100644
--- a/src/xcb_io.c
+++ b/src/xcb_io.c
@@ -356,7 +356,7 @@ void _XReadEvents(Display *dpy)
response = poll_for_response(dpy);
if(response)
handle_response(dpy, response, False);
- else if(dpy->xcb->pending_requests && dpy->xcb->pending_requests->reply_waiter)
+ else if(dpy->xcb->pending_requests->reply_waiter)
{ /* need braces around ConditionWait */
ConditionWait(dpy, dpy->xcb->reply_notify);
}