Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam 2021-09-27 22:01:10 +01:00
commit bf595a0cb0

View File

@ -318,11 +318,11 @@ server_client_set_session(struct client *c, struct session *s)
c->last_session = NULL;
c->session = s;
c->flags |= CLIENT_FOCUSED;
recalculate_sizes();
if (old != NULL && old->curw != NULL)
window_update_focus(old->curw->window);
if (s != NULL) {
recalculate_sizes();
window_update_focus(s->curw->window);
session_update_activity(s, NULL);
gettimeofday(&s->last_attached_time, NULL);
@ -2054,6 +2054,7 @@ server_client_dispatch(struct imsg *imsg, void *arg)
if (datalen != 0)
fatalx("bad MSG_EXITING size");
server_client_set_session(c, NULL);
recalculate_sizes();
tty_close(&c->tty);
proc_send(c->peer, MSG_EXITED, -1, NULL, 0);
break;