Merge branch 'obsd-master'

Conflicts:
	server-fn.c
This commit is contained in:
Thomas Adam
2017-10-20 12:36:29 +01:00
10 changed files with 158 additions and 82 deletions

View File

@ -423,6 +423,7 @@ server_child_exited(pid_t pid, int status)
TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp->pid == pid) {
wp->status = status;
wp->flags |= PANE_STATUSREADY;
log_debug("%%%u exited", wp->id);
wp->flags |= PANE_EXITED;