diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-07-22 18:39:00 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-07-22 18:39:00 +0200 |
commit | 61a6605ea1201eb49a126ca696fcfc56caf5dca6 (patch) | |
tree | 5b3aed6b0493301cfabfa088f59043d97081d6ed /src/terminal.c | |
parent | 9f1f49b839fbc5d099301d5318a5e1e70dd59b7c (diff) |
patch 8.0.0746: when :term fails the job is not properly cleaned upv8.0.0746
Problem: When :term fails the job is not properly cleaned up.
Solution: Free the terminal. Handle a job that failed to start. (closes
#1858)
Diffstat (limited to 'src/terminal.c')
-rw-r--r-- | src/terminal.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c index aafd7e89fa..7d807acbcb 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -203,6 +203,9 @@ ex_terminal(exarg_T *eap) } else { + free_terminal(term); + curbuf->b_term = NULL; + /* Wiping out the buffer will also close the window and call * free_terminal(). */ do_buffer(DOBUF_WIPE, DOBUF_CURRENT, FORWARD, 0, TRUE); @@ -235,7 +238,8 @@ free_terminal(term_T *term) if (term->tl_job != NULL) { - if (term->tl_job->jv_status != JOB_ENDED) + if (term->tl_job->jv_status != JOB_ENDED + && term->tl_job->jv_status != JOB_FAILED) job_stop(term->tl_job, NULL, "kill"); job_unref(term->tl_job); } @@ -941,7 +945,9 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd) setup_job_options(&opt, rows, cols); term->tl_job = job_start(argvars, &opt); - return term->tl_job != NULL ? OK : FAIL; + return term->tl_job != NULL + && term->tl_job->jv_channel != NULL + && term->tl_job->jv_status != JOB_FAILED ? OK : FAIL; } /* |