diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-11-20 02:42:43 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-11-20 02:42:43 +0100 |
commit | 48d23bb4de3dd37ba0d0b22e7c39d6b894cb1f75 (patch) | |
tree | 699b85358789af710c00d398eba88c89632f792f | |
parent | addc156c38d442367854f71baee31f2eb003c699 (diff) |
patch 8.1.0537: ui_breakcheck() may be called recursivelyv8.1.0537
Problem: ui_breakcheck() may be called recursively, which doesn't work.
Solution: When called recursively, just return. (James McCoy, closes #3617)
-rw-r--r-- | src/ui.c | 14 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 2 deletions
@@ -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 @@ -419,6 +427,8 @@ ui_breakcheck_force(int force) updating_screen = TRUE; else reset_updating_screen(FALSE); + + recursive = FALSE; } /***************************************************************************** diff --git a/src/version.c b/src/version.c index c0a5845d57..29488c2a77 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 537, +/**/ 536, /**/ 535, |