diff options
author | Thomas Adam <thomas@xteddy.org> | 2018-11-30 10:02:37 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2018-11-30 10:02:37 +0000 |
commit | 1c5093c1c4b6fd6a8dfee398f2139606db9843b5 (patch) | |
tree | eebc0ef5c3be42889a4b51e91cc884664de9313f /window.c | |
parent | 6cf2f74fe9fc205f4a14fc11fbe53daa7483dd19 (diff) | |
parent | 67254ed8df2434d7c974f66fbdbf3e4c58f61319 (diff) | |
download | rtmux-1c5093c1c4b6fd6a8dfee398f2139606db9843b5.tar.gz rtmux-1c5093c1c4b6fd6a8dfee398f2139606db9843b5.tar.bz2 rtmux-1c5093c1c4b6fd6a8dfee398f2139606db9843b5.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'window.c')
-rw-r--r-- | window.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -925,6 +925,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, sigprocmask(SIG_BLOCK, &set, &oldset); switch (wp->pid = fdforkpty(ptm_fd, &wp->fd, wp->tty, NULL, &ws)) { case -1: + wp->event = NULL; wp->fd = -1; xasprintf(cause, "%s: %s", cmd, strerror(errno)); @@ -1013,6 +1014,9 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, if (wp->event == NULL) fatalx("out of memory"); + wp->pipe_off = 0; + wp->flags &= ~PANE_EXITED; + bufferevent_setwatermark(wp->event, EV_READ, 0, READ_SIZE); bufferevent_enable(wp->event, EV_READ|EV_WRITE); |