Merge branch 'master' of github.com:tmux/tmux

1 files changed, 2 insertions, 1 deletions

diff --git a/proc.c b/proc.c
index f84ecf92..360d909b 100644
--- a/proc.c
+++ b/proc.c
@@ -59,7 +59,8 @@ proc_event_cb(__unused int fd, short events, void *arg)
 	struct imsg	 imsg;
 
 	if (!(peer->flags & PEER_BAD) && (events & EV_READ)) {
-		if ((n = imsg_read(&peer->ibuf)) == -1 || n == 0) {
+		if (((n = imsg_read(&peer->ibuf)) == -1 && errno != EAGAIN) ||
+		    n == 0) {
 			peer->dispatchcb(NULL, peer->arg);
 			return;
 		}