diff options
| -rw-r--r-- | tmux.h | 3 | ||||
| -rw-r--r-- | window.c | 14 |
2 files changed, 10 insertions, 7 deletions
@@ -768,8 +768,7 @@ struct window_pane { #define PANE_FOCUSPUSH 0x20 #define PANE_INPUTOFF 0x40 #define PANE_CHANGED 0x80 -#define PANE_ERROR 0x100 -#define PANE_EXITED 0x200 +#define PANE_EXITED 0x100 int argc; char **argv; @@ -391,13 +391,17 @@ window_destroy(struct window *w) int window_pane_destroy_ready(struct window_pane *wp) { - if (wp->pipe_fd != -1 && EVBUFFER_LENGTH(wp->pipe_event->output) != 0) - return (0); + int n; + + if (wp->pipe_fd != -1) { + if (EVBUFFER_LENGTH(wp->pipe_event->output) != 0) + return (0); + if (ioctl(wp->fd, FIONREAD, &n) != -1 && n > 0) + return (0); + } if (~wp->flags & PANE_EXITED) return (0); - if (~wp->flags & PANE_ERROR) - return (0); return (1); } @@ -1014,7 +1018,7 @@ window_pane_error_callback(__unused struct bufferevent *bufev, struct window_pane *wp = data; log_debug("%%%u error", wp->id); - wp->flags |= PANE_ERROR; + wp->flags |= PANE_EXITED; if (window_pane_destroy_ready(wp)) server_destroy_pane(wp, 1); |