circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-14 20:58:53 +00:00
Code Issues Projects Releases Wiki Activity

PatchSet 786

Browse Source 
Date: 2010/11/14 08:58:25
Author: nicm
Branch: HEAD
Tag: (none)
Log:
Don't allow last and active window to become the same - a very bad move
when the active window is closed and freed. Reported by sthen@.

Members:
        window.c:1.58->1.59
This commit is contained in:
Nicholas Marriott 2010-12-06 21:53:50 +00:00
parent fd51bf61c9
commit 36e537bcef
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
window.c
View File

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.140 2010-10-24 01:34:30 tcunha Exp $ */ /* $Id: window.c,v 1.141 2010-12-06 21:53:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -322,6 +322,8 @@ window_resize(struct window *w, u_int sx, u_int sy)
void void
window_set_active_pane(struct window *w, struct window_pane *wp) window_set_active_pane(struct window *w, struct window_pane *wp)
{ {
if (wp == w->active)
return;
w->last = w->active; w->last = w->active;
w->active = wp; w->active = wp;
while (!window_pane_visible(w->active)) { while (!window_pane_visible(w->active)) {
@ -339,7 +341,7 @@ window_set_active_at(struct window *w, u_int x, u_int y)
struct window_pane *wp; struct window_pane *wp;
TAILQ_FOREACH(wp, &w->panes, entry) { TAILQ_FOREACH(wp, &w->panes, entry) {
if (!window_pane_visible(wp)) if (wp == w->active || !window_pane_visible(wp))
continue; continue;
if (x < wp->xoff || x >= wp->xoff + wp->sx) if (x < wp->xoff || x >= wp->xoff + wp->sx)
continue; continue;