mirror of
https://github.com/neovim/neovim.git
synced 2025-09-17 08:48:16 +00:00
vim-patch:8.2.1748: closing split window in other tab may cause a crash
Problem: Closing split window in other tab may cause a crash.
Solution: Set tp_curwin properly. (Rob Pilling, closes vim/vim#7018)
f3c51bbff1
Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
@@ -3058,6 +3058,7 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
|
||||
static win_T *win_free_mem(win_T *win, int *dirp, tabpage_T *tp)
|
||||
{
|
||||
win_T *wp;
|
||||
tabpage_T *win_tp = tp == NULL ? curtab : tp;
|
||||
|
||||
if (!win->w_floating) {
|
||||
// Remove the window and its frame from the tree of frames.
|
||||
@@ -3082,10 +3083,10 @@ static win_T *win_free_mem(win_T *win, int *dirp, tabpage_T *tp)
|
||||
}
|
||||
win_free(win, tp);
|
||||
|
||||
// When deleting the current window of another tab page select a new
|
||||
// current window.
|
||||
if (tp != NULL && win == tp->tp_curwin) {
|
||||
tp->tp_curwin = wp;
|
||||
// When deleting the current window in the tab, select a new current
|
||||
// window.
|
||||
if (win == win_tp->tp_curwin) {
|
||||
win_tp->tp_curwin = wp;
|
||||
}
|
||||
|
||||
return wp;
|
||||
|
Reference in New Issue
Block a user