diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-08-14 01:34:54 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-08-14 01:34:54 +0100 |
| commit | 54773d23b5ceb779c524dcac6bf3b848886fb6d6 (patch) | |
| tree | 5c60007637121f63c8c730a04f4e8e741577c21a /server-fn.c | |
| parent | 4c07367bfe626fce990f5b5b2d00516ae8249a93 (diff) | |
| parent | 63aa96864280ff07f706ebbae302b7c15abb964f (diff) | |
| download | rtmux-54773d23b5ceb779c524dcac6bf3b848886fb6d6.tar.gz rtmux-54773d23b5ceb779c524dcac6bf3b848886fb6d6.tar.bz2 rtmux-54773d23b5ceb779c524dcac6bf3b848886fb6d6.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/server-fn.c b/server-fn.c index 656de08e..2521200a 100644 --- a/server-fn.c +++ b/server-fn.c @@ -446,21 +446,9 @@ server_destroy_session(struct session *s) TAILQ_FOREACH(c, &clients, entry) { if (c->session != s) continue; - if (s_new == NULL) { - c->session = NULL; + server_client_set_session(c, NULL); + if (s_new == NULL) c->flags |= CLIENT_EXIT; - } else { - c->last_session = NULL; - c->session = s_new; - server_client_set_key_table(c, NULL); - tty_update_client_offset(c); - status_timer_start(c); - notify_client("client-session-changed", c); - session_update_activity(s_new, NULL); - gettimeofday(&s_new->last_attached_time, NULL); - server_redraw_client(c); - alerts_check_session(s_new); - } } recalculate_sizes(); } |