Skip to content

Commit

Permalink
patch 8.1.0537: ui_breakcheck() may be called recursively
Browse files Browse the repository at this point in the history
Problem:    ui_breakcheck() may be called recursively, which doesn't work.
Solution:   When called recursively, just return. (James McCoy, closes #3617)
  • Loading branch information
brammool committed Nov 20, 2018
1 parent addc156 commit 48d23bb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 12 additions & 2 deletions src/ui.c
Expand Up @@ -403,9 +403,17 @@ ui_breakcheck(void)
void
ui_breakcheck_force(int force)
{
int save_updating_screen = updating_screen;
static int recursive = FALSE;
int save_updating_screen = updating_screen;

/* We do not want gui_resize_shell() to redraw the screen here. */
// We could be called recursively if stderr is redirected, calling
// fill_input_buf() calls settmode() when stdin isn't a tty. settmode()
// calls vgetorpeek() which calls ui_breakcheck() again.
if (recursive)
return;
recursive = TRUE;

// We do not want gui_resize_shell() to redraw the screen here.
++updating_screen;

#ifdef FEAT_GUI
Expand All @@ -419,6 +427,8 @@ ui_breakcheck_force(int force)
updating_screen = TRUE;
else
reset_updating_screen(FALSE);

recursive = FALSE;
}

/*****************************************************************************
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -792,6 +792,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
537,
/**/
536,
/**/
Expand Down

0 comments on commit 48d23bb

Please sign in to comment.