diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-12-26 23:45:21 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-12-26 23:45:21 +0000 |
| commit | f81b3ddf94c9f593bc37cd79528fcca42697ce1b (patch) | |
| tree | 0365dcad22fb8eaf6ef4f20ab735120bbb098d88 | |
| parent | e447088a8a3568993d66d94bc4f0094f284b2f14 (diff) | |
| download | rtmux-f81b3ddf94c9f593bc37cd79528fcca42697ce1b.tar.gz rtmux-f81b3ddf94c9f593bc37cd79528fcca42697ce1b.tar.bz2 rtmux-f81b3ddf94c9f593bc37cd79528fcca42697ce1b.zip | |
Sync OpenBSD patchset 591:
Fix a couple of problems with grouped sessions reported by danh: redraw
properly and choose the correct last window after a window is killed.
| -rw-r--r-- | server-fn.c | 8 | ||||
| -rw-r--r-- | session.c | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/server-fn.c b/server-fn.c index ab8f03ec..f1de20c1 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.99 2009-12-04 22:14:47 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.100 2009-12-26 23:45:21 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -250,10 +250,8 @@ server_kill_window(struct window *w) if (session_detach(s, wl)) server_destroy_session_group(s); - else { - server_redraw_session(s); - server_status_session_group(s); - } + else + server_redraw_session_group(s); } } @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.73 2009-12-04 22:14:47 tcunha Exp $ */ +/* $Id: session.c,v 1.74 2009-12-26 23:45:21 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -548,10 +548,10 @@ session_group_synchronize1(struct session *target, struct session *s) return; /* If the current window has vanished, move to the next now. */ - if (s->curw != NULL) { - while (winlink_find_by_index(ww, s->curw->idx) == NULL) - session_next(s, 0); - } + if (s->curw != NULL && + winlink_find_by_index(ww, s->curw->idx) == NULL && + session_last(s) != 0 && session_previous(s, 0) != 0) + session_next(s, 0); /* Save the old pointer and reset it. */ memcpy(&old_windows, &s->windows, sizeof old_windows); |