Permalink
Browse files

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.
  • Loading branch information...
brammool committed Jun 5, 2017
1 parent bb7943b commit 9472eec83c3f9c191814dc81dd82498c10b1fc9c
Showing with 11 additions and 4 deletions.
  1. +9 −4 src/gui.c
  2. +2 −0 src/version.c
View
@@ -2849,6 +2849,10 @@ gui_insert_lines(int row, int count)
}
}
/*
* 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 @@ gui_wait_for_chars_or_timer(long wtime)
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_or_timer(long wtime)
gui_wait_for_chars(long wtime)
{
int retval;
int tb_change_cnt = typebuf.tb_change_cnt;
#ifdef FEAT_MENU
/*
@@ -2953,7 +2958,7 @@ gui_wait_for_chars(long wtime)
}
#endif
if (retval == FAIL)
if (retval == FAIL && typebuf.tb_change_cnt == tb_change_cnt)
{
/* Blocking wait. */
before_blocking();
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
619,
/**/
618,
/**/

0 comments on commit 9472eec

Please sign in to comment.