circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 11:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Don't segfaut when the parent of the layout cell is NULL, from Thomas Adam.

Browse Source
This commit is contained in:
Nicholas Marriott 2014-03-06 13:01:51 +00:00
parent cbd360b7dd
commit 78e783e786
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
window.c
View File

@ -420,10 +420,15 @@ window_pane_active_set(struct window_pane *wp, struct window_pane *nextwp)
void void
window_pane_active_lost(struct window_pane *wp, struct window_pane *nextwp) window_pane_active_lost(struct window_pane *wp, struct window_pane *nextwp)
{ {
struct layout_cell *lc, *lc2; struct layout_cell *lc, *lc2, *lcparent;
/* Get the parent cell. */
lcparent = nextwp->layout_cell->parent;
if (lcparent == NULL)
return;
/* Save the target pane in its parent. */ /* Save the target pane in its parent. */
nextwp->layout_cell->parent->lastwp = nextwp; lcparent->lastwp = nextwp;
/* /*
* Save the source pane in all of its parents up to, but not including, * Save the source pane in all of its parents up to, but not including,
@ -432,8 +437,7 @@ window_pane_active_lost(struct window_pane *wp, struct window_pane *nextwp)
if (wp == NULL) if (wp == NULL)
return; return;
for (lc = wp->layout_cell->parent; lc != NULL; lc = lc->parent) { for (lc = wp->layout_cell->parent; lc != NULL; lc = lc->parent) {
lc2 = nextwp->layout_cell->parent; for (lc2 = lcparent; lc2 != NULL; lc2 = lc2->parent) {
for (; lc2 != NULL; lc2 = lc2->parent) {
if (lc == lc2) if (lc == lc2)
return; return;
} }