diff options
| author | Thomas Adam <thomas@xteddy.org> | 2013-07-06 11:18:49 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2013-07-06 11:18:49 +0100 |
| commit | bdea2f9eda1abc8f4a6c423af62ef7538b2ad249 (patch) | |
| tree | f634639dad6a8775aa4692702b11a52f27aecac5 /server-fn.c | |
| parent | e496a548d7b07c9a4be9ce8e750cf5423e3bafe3 (diff) | |
| parent | f5b041e3949e9a129d68d9919725c3afcd81ed5a (diff) | |
| download | rtmux-bdea2f9eda1abc8f4a6c423af62ef7538b2ad249.tar.gz rtmux-bdea2f9eda1abc8f4a6c423af62ef7538b2ad249.tar.bz2 rtmux-bdea2f9eda1abc8f4a6c423af62ef7538b2ad249.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/server-fn.c b/server-fn.c index 7ef64138..86e2054e 100644 --- a/server-fn.c +++ b/server-fn.c @@ -262,8 +262,9 @@ server_lock_client(struct client *c) void server_kill_window(struct window *w) { - struct session *s, *next_s; - struct winlink *wl; + struct session *s, *next_s, *target_s; + struct session_group *sg; + struct winlink *wl; next_s = RB_MIN(sessions, &sessions); while (next_s != NULL) { @@ -280,8 +281,13 @@ server_kill_window(struct window *w) server_redraw_session_group(s); } - if (options_get_number(&s->options, "renumber-windows")) - session_renumber_windows(s); + if (options_get_number(&s->options, "renumber-windows")) { + if ((sg = session_group_find(s)) != NULL) { + TAILQ_FOREACH(target_s, &sg->sessions, gentry) + session_renumber_windows(target_s); + } else + session_renumber_windows(s); + } } recalculate_sizes(); } |