Mercurial > vim

diff src/terminal.c @ 11727:cb1dc90d22cc v8.0.0746

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0746: when :term fails the job is not properly cleaned up commit https://github.com/vim/vim/commit/61a6605ea1201eb49a126ca696fcfc56caf5dca6 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 22 18:39:00 2017 +0200 patch 8.0.0746: when :term fails the job is not properly cleaned up Problem: When :term fails the job is not properly cleaned up. Solution: Free the terminal. Handle a job that failed to start. (closes #1858)
author Christian Brabandt <cb@256bit.org>
date Sat, 22 Jul 2017 18:45:04 +0200
parents 22cef8face93
children 1c8ec1029233
line wrap: on
line diff
--- 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
     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;
 }
 
 /*