circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 779: 

When removing a pane, don't change the active pane unless the active
pane is actually the one being removed.
pull/1/head
Tiago Cunha 2010-10-24 01:32:35 +00:00
parent 2da0730f78
commit 8703e9f2f9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
window.c
View File

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