diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-01-25 17:13:43 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-01-25 17:13:43 +0000 |
| commit | 391b2090083090e415e799085d20f63d70d83733 (patch) | |
| tree | abda57e77fc9d2dd126f79f29d9eefb51bd33635 | |
| parent | c744964cd96554415a8a707c47eef3e0db0a60af (diff) | |
| download | rtmux-391b2090083090e415e799085d20f63d70d83733.tar.gz rtmux-391b2090083090e415e799085d20f63d70d83733.tar.bz2 rtmux-391b2090083090e415e799085d20f63d70d83733.zip | |
Sync OpenBSD patchset 615:
When a window is destroyed, remove all links to it from each session rather
than just the first. Reported by Robin Lee Powell.
| -rw-r--r-- | server-fn.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server-fn.c b/server-fn.c index 506d73ff..30bc2bb1 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.101 2010-01-05 23:52:37 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.102 2010-01-25 17:13:43 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -260,13 +260,13 @@ server_kill_window(struct window *w) s = ARRAY_ITEM(&sessions, i); if (s == NULL || !session_has(s, w)) continue; - if ((wl = winlink_find_by_window(&s->windows, w)) == NULL) - continue; - - if (session_detach(s, wl)) - server_destroy_session_group(s); - else - server_redraw_session_group(s); + while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) { + if (session_detach(s, wl)) { + server_destroy_session_group(s); + break; + } else + server_redraw_session_group(s); + } } } |