diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-04-21 16:01:18 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-04-21 16:01:18 +0100 |
| commit | 4612419c143c3f748bc5f6ccd467c7c0014e8d48 (patch) | |
| tree | 42929aeeb8b1d89abf639124412199fac7092f04 /format.c | |
| parent | 93062ad09952f411d48818b05dc9898bc14dcfde (diff) | |
| parent | c799425069d02675474cda312fac1457829052fb (diff) | |
| download | rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.gz rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.bz2 rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -574,10 +574,12 @@ format_create(struct cmdq_item *item, int tag, int flags) format_add(ft, "socket_path", "%s", socket_path); format_add_tv(ft, "start_time", &start_time); - if (item != NULL && item->cmd != NULL) - format_add(ft, "command", "%s", item->cmd->entry->name); - if (item != NULL && item->formats != NULL) - format_merge(ft, item->formats); + if (item != NULL) { + if (item->cmd != NULL) + format_add(ft, "command", "%s", item->cmd->entry->name); + if (item->shared != NULL && item->shared->formats != NULL) + format_merge(ft, item->shared->formats); + } return (ft); } |