Fix a couple of problems with grouped sessions reported by danh: redraw

properly and choose the correct last window after a window is killed.
pull/1/head
Nicholas Marriott 2009-12-22 10:20:08 +00:00
parent 19ea306606
commit 4feee126b8
2 changed files with 6 additions and 8 deletions

View File

@ -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);
}
}

View File

@ -549,10 +549,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);