From aa6adacd77e59b2cf2ca7bdeae9a24c062b2a9c0 Mon Sep 17 00:00:00 2001 From: Tony Chen <36219739+chentau@users.noreply.github.com> Date: Mon, 29 Mar 2021 05:19:59 -0700 Subject: Make sure window is still valid in the middle of calling :lopen (#14240) Make sure that oldwin is not invalid after splitting Revisit this when porting vim patch v8.1.0892 and related quickfix patches. --- src/nvim/quickfix.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/nvim/quickfix.c') diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index dfd38a6eca..0785fa703d 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -3617,6 +3617,15 @@ static int qf_open_new_cwindow(qf_info_T *qi, int height) if (win_split(height, flags) == FAIL) { return FAIL; // not enough room for window } + + // User autocommands may have invalidated the previous window after calling + // win_split, so add a check to ensure that the win is still here + if (IS_LL_STACK(qi) && !win_valid(win)) { + // close the window that was supposed to be for the loclist + win_close(curwin, false); + return FAIL; + } + RESET_BINDING(curwin); if (IS_LL_STACK(qi)) { -- cgit