circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-07-03 10:01:14 +01:00
parent 6fba9a39b7 28687f2d55
commit 4e01036cb6
5 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
window.c
View File

@ -387,6 +387,19 @@ window_destroy(struct window *w)
free(w);
}
int
window_pane_destroy_ready(struct window_pane *wp)
{
if (wp->pipe_fd != -1 && EVBUFFER_LENGTH(wp->pipe_event->output) != 0)
return (0);
if (~wp->flags & PANE_EXITED)
return (0);
if (~wp->flags & PANE_ERROR)
return (0);
return (1);
}
void
window_add_ref(struct window *w, const char *from)
{
@ -1014,7 +1027,11 @@ window_pane_error_callback(__unused struct bufferevent *bufev,
{
struct window_pane *wp = data;
server_destroy_pane(wp, 1);
log_debug("%%%u error", wp->id);
wp->flags |= PANE_ERROR;
if (window_pane_destroy_ready(wp))
server_destroy_pane(wp, 1);
}
void