mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-23 08:33:17 +01:00
Sync OpenBSD patchset 779:
When removing a pane, don't change the active pane unless the active pane is actually the one being removed.
This commit is contained in:
parent
2da0730f78
commit
8703e9f2f9
10
window.c
10
window.c
@ -1,4 +1,4 @@
|
||||
/* $Id: window.c,v 1.138 2010-10-24 00:45:57 tcunha Exp $ */
|
||||
/* $Id: window.c,v 1.139 2010-10-24 01:32:35 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -365,9 +365,11 @@ window_add_pane(struct window *w, u_int hlimit)
|
||||
void
|
||||
window_remove_pane(struct window *w, struct window_pane *wp)
|
||||
{
|
||||
w->active = TAILQ_PREV(wp, window_panes, entry);
|
||||
if (w->active == NULL)
|
||||
w->active = TAILQ_NEXT(wp, entry);
|
||||
if (wp == w->active) {
|
||||
w->active = TAILQ_PREV(wp, window_panes, entry);
|
||||
if (w->active == NULL)
|
||||
w->active = TAILQ_NEXT(wp, entry);
|
||||
}
|
||||
|
||||
TAILQ_REMOVE(&w->panes, wp, entry);
|
||||
window_pane_destroy(wp);
|
||||
|
Loading…
Reference in New Issue
Block a user