circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

pull/2802/head
Thomas Adam 2021-07-14 00:01:21 +01:00
parent 7496e70bd7 38c5788232
commit bb4bc8caf4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
format.c
View File

@ -371,9 +371,6 @@ format_job_get(struct format_expand_state *es, const char *cmd)
fj->client = ft->client;
fj->tag = ft->tag;
fj->cmd = xstrdup(cmd);
fj->expanded = NULL;
xasprintf(&fj->out, "<'%s' not ready>", fj->cmd);
RB_INSERT(format_job_tree, jobs, fj);
}
@ -402,11 +399,14 @@ format_job_get(struct format_expand_state *es, const char *cmd)
}
fj->last = t;
fj->updated = 0;
}
} else if (fj->job != NULL && (t - fj->last) > 1 && fj->out == NULL)
xasprintf(&fj->out, "<'%s' not ready>", fj->cmd);
free(expanded);
if (ft->flags & FORMAT_STATUS)
fj->status = 1;
if (fj->out == NULL)
return (xstrdup(""));
return (format_expand1(&next, fj->out));
}