diff options
| -rw-r--r-- | src/nvim/window.c | 6 | ||||
| -rw-r--r-- | test/old/testdir/test_crash.vim | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 8ff8053118..89bdd7f5e0 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -3776,6 +3776,12 @@ void close_others(int message, int forceit) continue; } + // autoccommands messed this one up + if (!buf_valid(wp->w_buffer) && win_valid(wp)) { + wp->w_buffer = NULL; + win_close(wp, false, false); + continue; + } // Check if it's allowed to abandon this window int r = can_abandon(wp->w_buffer, forceit); if (!win_valid(wp)) { // autocommands messed wp up diff --git a/test/old/testdir/test_crash.vim b/test/old/testdir/test_crash.vim index b997cc1d29..8c79d3abd6 100644 --- a/test/old/testdir/test_crash.vim +++ b/test/old/testdir/test_crash.vim @@ -40,7 +40,7 @@ func Test_crash1() " clean up call delete('Xerr') " This test takes a bit longer - call TermWait(buf, 500) + call TermWait(buf, 1000) let file = 'crash/poc_tagfunc.vim' let args = printf(cmn_args, vim, file) @@ -55,7 +55,7 @@ func Test_crash1() \ ' && echo "crash 6: [OK]" >> X_crash1_result.txt' .. "\<cr>") " clean up call delete('X') - call TermWait(buf, 200) + call TermWait(buf, 1000) " clean up exe buf .. "bw!" |