diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-29 15:53:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-29 15:53:39 +0200 |
| commit | 1e8340bbbfb26d170a3f8b135dcb874e90a74e0b (patch) | |
| tree | 1e8fb746031ea5e09880e8dfa992257ade6bfdac | |
| parent | 696d00f488dc0599692993f226a7dd95a187920d (diff) | |
patch 8.0.0801: terminal window title says "running" after job exitsv8.0.0801
Problem: The terminal window title sometimes still says "running" even
though the job has finished.
Solution: Also consider the job finished when the channel has been closed.
| -rw-r--r-- | src/terminal.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c index b68081f314..d02e7f12c4 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -491,7 +491,11 @@ term_convert_key(int c, char *buf) static int term_job_running(term_T *term) { - return term->tl_job != NULL && term->tl_job->jv_status == JOB_STARTED; + /* Also consider the job finished when the channel is closed, to avoid a + * race condition when updating the title. */ + return term->tl_job != NULL + && term->tl_job->jv_status == JOB_STARTED + && channel_is_open(term->tl_job->jv_channel); } /* diff --git a/src/version.c b/src/version.c index a44e5505b9..4c2a48ad37 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 801, +/**/ 800, /**/ 799, |