diff options
| -rw-r--r-- | src/xcb_io.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/xcb_io.c b/src/xcb_io.c index 022f5c49..b246fb9f 100644 --- a/src/xcb_io.c +++ b/src/xcb_io.c @@ -232,25 +232,19 @@ static xcb_generic_reply_t *poll_for_response(Display *dpy) void *response; xcb_generic_error_t *error; PendingRequest *req; - - response = poll_for_event(dpy); - if (response) - return response; - - while((req = dpy->xcb->pending_requests) && + while(!(response = poll_for_event(dpy)) && + (req = dpy->xcb->pending_requests) && !req->reply_waiter && xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &response, &error)) { assert(XLIB_SEQUENCE_COMPARE(req->sequence, <=, dpy->request)); dpy->last_request_read = req->sequence; - if(response) - return response; - dequeue_pending_request(dpy, req); + if(!response) + dequeue_pending_request(dpy, req); if(error) return (xcb_generic_reply_t *) error; } - - return NULL; + return response; } static void handle_response(Display *dpy, xcb_generic_reply_t *response, Bool in_XReply) |