# HG changeset patch # User Bram Moolenaar # Date 1278963499 -7200 # Node ID b619655b31db9469f6fe41932daff7a566079097 # Parent cb94c42c0e1a1e00f643be8a96939e42c3afff81 updated for version 7.2.446 Problem: Crash in GUI when closing the last window in a tabpage. (ryo7000) Solution: Remove the tabpage from the list before freeing the window. diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 446, +/**/ 445, /**/ 444, diff --git a/src/window.c b/src/window.c --- a/src/window.c +++ b/src/window.c @@ -2304,6 +2304,7 @@ win_close_othertab(win, free_buf, tp) win_T *wp; int dir; tabpage_T *ptp = NULL; + int free_tp = FALSE; /* Close the link to the buffer. */ close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0); @@ -2321,11 +2322,8 @@ win_close_othertab(win, free_buf, tp) if (wp == NULL) return; - /* Free the memory used for the window. */ - wp = win_free_mem(win, &dir, tp); - /* When closing the last window in a tab page remove the tab page. */ - if (wp == NULL) + if (tp == NULL ? firstwin == lastwin : tp->tp_firstwin == tp->tp_lastwin) { if (tp == first_tabpage) first_tabpage = tp->tp_next; @@ -2341,8 +2339,14 @@ win_close_othertab(win, free_buf, tp) } ptp->tp_next = tp->tp_next; } + free_tp = TRUE; + } + + /* Free the memory used for the window. */ + win_free_mem(win, &dir, tp); + + if (free_tp) free_tabpage(tp); - } } /*