circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-07 16:28:48 +00:00
Code Issues Projects Releases Wiki Activity

With force, kill previous job before starting new. Fixes problem

Browse Source 
reported by Scott Mcdermott in GitHub issue 1627.
This commit is contained in:
nicm 2019-03-18 09:46:42 +00:00
parent bd3332b211
commit d2d43987d0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
format.c
View File

@ -346,7 +346,9 @@ format_job_get(struct format_tree *ft, const char *cmd)
force = (ft->flags & FORMAT_FORCE); force = (ft->flags & FORMAT_FORCE);
t = time(NULL); t = time(NULL);
if (fj->job == NULL && (force || fj->last != t)) { if (force && fj->job != NULL)
job_free(fj->job);
if (force || (fj->job == NULL && fj->last != t)) {
fj->job = job_run(expanded, NULL, fj->job = job_run(expanded, NULL,
server_client_get_cwd(ft->client, NULL), format_job_update, server_client_get_cwd(ft->client, NULL), format_job_update,
format_job_complete, NULL, fj, JOB_NOWAIT); format_job_complete, NULL, fj, JOB_NOWAIT);

2
status.c
View File

@ -704,7 +704,7 @@ status_message_redraw(struct client *c)
lines = status_line_size(c); lines = status_line_size(c);
if (lines <= 1) if (lines <= 1)
lines = 1; lines = 1;
screen_init(sl->active, c->tty.sx, 1, 0); screen_init(sl->active, c->tty.sx, lines, 0);
len = screen_write_strlen("%s", c->message_string); len = screen_write_strlen("%s", c->message_string);
if (len > c->tty.sx) if (len > c->tty.sx)