patch 8.0.0619: GUI gets stuck if timer uses feedkeys()
Problem: In the GUI, when a timer uses feedkeys(), it still waits for an
event. (Raymond Ko)
Solution: Check tb_change_cnt in one more place.
diff --git a/src/gui.c b/src/gui.c
index 7d44db1..25310aa 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2849,6 +2849,10 @@
}
}
+/*
+ * Returns OK if a character was found to be available within the given time,
+ * or FAIL otherwise.
+ */
static int
gui_wait_for_chars_or_timer(long wtime)
{
@@ -2869,16 +2873,16 @@
if (typebuf.tb_change_cnt != tb_change_cnt)
{
/* timer may have used feedkeys() */
- return FALSE;
+ return FAIL;
}
if (due_time <= 0 || (wtime > 0 && due_time > remaining))
due_time = remaining;
if (gui_mch_wait_for_chars(due_time))
- return TRUE;
+ return OK;
if (wtime > 0)
remaining -= due_time;
}
- return FALSE;
+ return FAIL;
#else
return gui_mch_wait_for_chars(wtime);
#endif
@@ -2896,6 +2900,7 @@
gui_wait_for_chars(long wtime)
{
int retval;
+ int tb_change_cnt = typebuf.tb_change_cnt;
#ifdef FEAT_MENU
/*
@@ -2953,7 +2958,7 @@
}
#endif
- if (retval == FAIL)
+ if (retval == FAIL && typebuf.tb_change_cnt == tb_change_cnt)
{
/* Blocking wait. */
before_blocking();