diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-08-25 12:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-08-25 12:01:10 +0100 |
| commit | 1bc467fe52248410321cd4880b9688e514c406d7 (patch) | |
| tree | 4a6e79613f2d8ecf3936fd22650930b0bc3e4bd2 | |
| parent | 88eb30222150798a33ddc786b785e63f2d0280a3 (diff) | |
| parent | 6bf033beae757814c8ea63f3394e05ce1c1e4d15 (diff) | |
| download | rtmux-1bc467fe52248410321cd4880b9688e514c406d7.tar.gz rtmux-1bc467fe52248410321cd4880b9688e514c406d7.tar.bz2 rtmux-1bc467fe52248410321cd4880b9688e514c406d7.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-display-message.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c index a041b5a1..217d164a 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -78,9 +78,10 @@ cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq) msg = format_expand_time(ft, template, time(NULL)); if (args_has(self->args, 'p')) cmdq_print(cmdq, "%s", msg); - else + else if (c != NULL) status_message_set(c, "%s", msg); free(msg); + format_free(ft); return (CMD_RETURN_NORMAL); |