summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-23 23:16:45 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-23 23:16:45 +0200
commit8f7ab4bd1e66fd532bdef6559502d961f03b54d8 (patch)
tree0db32b5f8e2cbcdea2469ef4739655b1cd49e0e0 /src
parent823edd1eed00329e4b269991155bbdb1d9aaa540 (diff)
downloadvim-git-8f7ab4bd1e66fd532bdef6559502d961f03b54d8.tar.gz
patch 8.1.2204: crash on exit when closing terminalsv8.1.2204
Problem: Crash on exit when closing terminals. (Corey Hickey) Solution: Actually wait for the job to stop. (closes #5100)
Diffstat (limited to 'src')
-rw-r--r--src/terminal.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 07b2e973e..b50198ca5 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1494,7 +1494,7 @@ term_try_stop_job(buf_T *buf)
if (job->jv_status >= JOB_ENDED)
return OK;
- ui_delay(10L, FALSE);
+ ui_delay(10L, TRUE);
term_flush_messages();
}
return FAIL;
diff --git a/src/version.c b/src/version.c
index e1bc377f9..09e8ad3dc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2204,
+/**/
2203,
/**/
2202,