aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.2.446

Browse Source 
Problem:    Crash in GUI when closing the last window in a tabpage. (ryo7000)
Solution:   Remove the tabpage from the list before freeing the window.
This commit is contained in:
Bram Moolenaar
2010-07-12 21:38:19 +02:00
parent 2cefbedaab
commit 4d770fb566
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/window.c
View File

@@ -2307,6 +2307,7 @@ win_close_othertab(win, free_buf, tp)
win_T *wp; win_T *wp;
int dir; int dir;
tabpage_T *ptp = NULL; tabpage_T *ptp = NULL;
int free_tp = FALSE;
/* Close the link to the buffer. */ /* Close the link to the buffer. */
close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0); close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0);
@@ -2324,11 +2325,8 @@ win_close_othertab(win, free_buf, tp)
if (wp == NULL) if (wp == NULL)
return; 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. */ /* 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) if (tp == first_tabpage)
first_tabpage = tp->tp_next; first_tabpage = tp->tp_next;
@@ -2344,8 +2342,14 @@ win_close_othertab(win, free_buf, tp)
} }
ptp->tp_next = tp->tp_next; ptp->tp_next = tp->tp_next;
} }
free_tabpage(tp); free_tp = TRUE;
} }
/* Free the memory used for the window. */
win_free_mem(win, &dir, tp);
if (free_tp)
free_tabpage(tp);
} }
/* /*