patch 8.1.1703: breaking out of loop by checking window pointer insufficient
Problem: Breaking out of loop by checking window pointer is insufficient.
Solution: Check the window ID and the buffer number. (closes #4683)
diff --git a/src/misc2.c b/src/misc2.c
index 000f043..0e41be4 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4442,7 +4442,8 @@
void
parse_queued_messages(void)
{
- win_T *old_curwin = curwin;
+ int old_curwin_id = curwin->w_id;
+ int old_curbuf_fnum = curbuf->b_fnum;
int i;
int save_may_garbage_collect = may_garbage_collect;
@@ -4494,9 +4495,9 @@
may_garbage_collect = save_may_garbage_collect;
- // If the current window changed we need to bail out of the waiting loop.
- // E.g. when a job exit callback closes the terminal window.
- if (curwin != old_curwin)
+ // If the current window or buffer changed we need to bail out of the
+ // waiting loop. E.g. when a job exit callback closes the terminal window.
+ if (curwin->w_id != old_curwin_id || curbuf->b_fnum != old_curbuf_fnum)
ins_char_typebuf(K_IGNORE);
}
#endif
diff --git a/src/version.c b/src/version.c
index c379553..e3373be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1703,
+/**/
1702,
/**/
1701,