summaryrefslogtreecommitdiff
path: root/src/ex_getln.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-02-06 18:08:45 +0100
committerBram Moolenaar <Bram@vim.org>2021-02-06 18:08:45 +0100
commit8c6951fa2836a1ae3257770e7b927a9380439912 (patch)
treee05bd10a6c9b28a523904e7d08aa7acfe8c12753 /src/ex_getln.c
parentaad5f9d79a2b71e9d2581eace3652be156102b9d (diff)
downloadvim-git-8c6951fa2836a1ae3257770e7b927a9380439912.tar.gz
patch 8.2.2473: crash when leaving command line window triggers autocommandv8.2.2473
Problem: Crash when leaving command line window triggers autocommand. (houyunsong) Solution: Make sure not to close the current window or buffer.
Diffstat (limited to 'src/ex_getln.c')
-rw-r--r--src/ex_getln.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index d6712c126..faa56e14b 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4403,12 +4403,12 @@ open_cmdwin(void)
// win_goto() may trigger an autocommand that already closes the
// cmdline window.
- if (win_valid(wp))
+ if (win_valid(wp) && wp != curwin)
win_close(wp, TRUE);
// win_close() may have already wiped the buffer when 'bh' is
- // set to 'wipe'
- if (bufref_valid(&bufref))
+ // set to 'wipe', autocommands may have closed other windows
+ if (bufref_valid(&bufref) && bufref.br_buf != curbuf)
close_buffer(NULL, bufref.br_buf, DOBUF_WIPE, FALSE, FALSE);
// Restore window sizes.