diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-09-06 20:47:50 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-09-06 20:47:50 +0100 |
commit | 76688d204071b76fd3388e46e944e4b917c09625 (patch) | |
tree | b6c7920003106991bbb8db46a432e47b16429c94 /format.c | |
parent | 2ebef95994953e49ae84862a65f9ee649a72e200 (diff) | |
parent | aceae73b9a401c0b124a3534079e9c0d998f0dbd (diff) | |
download | rtmux-76688d204071b76fd3388e46e944e4b917c09625.tar.gz rtmux-76688d204071b76fd3388e46e944e4b917c09625.tar.bz2 rtmux-76688d204071b76fd3388e46e944e4b917c09625.zip |
Merge branch 'obsd-master'
Conflicts:
cfg.c
tmux.c
Diffstat (limited to 'format.c')
-rw-r--r-- | format.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -220,8 +220,7 @@ format_job_get(struct format_tree *ft, const char *cmd) struct format_job fj0, *fj; fj0.cmd = cmd; - if ((fj = RB_FIND(format_job_tree, &format_jobs, &fj0)) == NULL) - { + if ((fj = RB_FIND(format_job_tree, &format_jobs, &fj0)) == NULL) { fj = xcalloc(1, sizeof *fj); fj->cmd = xstrdup(cmd); fj->status = ft->status; |