Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-09-19 19:20:18 +01:00
commit 0c51b57b99
1 changed files with 6 additions and 0 deletions

View File

@ -657,6 +657,12 @@ void xcb_prep_cb(struct ev_loop *loop, ev_prepare *watcher, int revents) {
*/
void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) {
xcb_generic_event_t *event;
if (xcb_connection_has_error(xcb_connection)) {
ELOG("X11 connection was closed unexpectedly - maybe your X server terminated / crashed?\n");
exit(1);
}
while ((event = xcb_poll_for_event(xcb_connection)) == NULL) {
return;
}