Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-08-17 22:01:18 +01:00
3 changed files with 5 additions and 3 deletions

View File

@ -664,7 +664,7 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit)
uint64_t age, t = get_timer();
wp = control_window_pane(c, cp->pane);
if (wp == NULL) {
if (wp == NULL || wp->fd == -1) {
TAILQ_FOREACH_SAFE(cb, &cp->blocks, entry, cb1) {
TAILQ_REMOVE(&cp->blocks, cb, entry);
control_free_block(cs, cb);
@ -864,7 +864,7 @@ control_check_subs_pane(struct client *c, struct control_sub *csub)
struct control_sub_pane *csp, find;
wp = window_pane_find_by_id(csub->id);
if (wp == NULL)
if (wp == NULL || wp->fd == -1)
return;
w = wp->window;