mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 22:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

window: don't crash when closing two floats in a row

Browse Source 
prevwin can be set to the current window. Then we can't jump to it
after closing a float.
This commit is contained in:
Björn Linse
2019-03-20 10:56:52 +01:00
parent 3e78319ac6
commit ae49e8da58
2 changed files with 117 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/window.c
View File

@@ -2313,10 +2313,10 @@ int win_close(win_T *win, bool free_buf)
if (!win->w_floating) {
wp = frame2win(win_altframe(win, NULL));
} else {
if (win_valid(prevwin)) {
if (win_valid(prevwin) && prevwin != win) {
wp = prevwin;
} else {
wp = curtab->tp_firstwin;
wp = firstwin;
}
}
@@ -2595,10 +2595,10 @@ win_free_mem (
wp = winframe_remove(win, dirp, tp);
xfree(frp);
} else {
if (win_valid(prevwin)) {
if (win_valid(prevwin) && prevwin != win) {
wp = prevwin;
} else {
wp = curtab->tp_firstwin;
wp = firstwin;
}
}
win_free(win, tp);