Merge branch 'master' into floating_panes

This commit is contained in:
Nicholas Marriott
2026-05-17 15:55:09 +01:00
7 changed files with 38 additions and 20 deletions

View File

@@ -375,12 +375,10 @@ window_pane_destroy_ready(struct window_pane *wp)
{
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->pipe_fd != -1 && 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);