diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-09-14 12:42:19 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-09-14 12:42:19 +0100 |
commit | 74b958ecbed7102a0f3f5faf5d976411726661ba (patch) | |
tree | 7b0cc592b9127fe05afc9bbbf67263489d66eb85 /status.c | |
parent | ef35c9f7659205659d6863058b9a7262b21440a5 (diff) | |
parent | 16efa8483888e326aed2c05a01b63b45a2b118ef (diff) | |
download | rtmux-74b958ecbed7102a0f3f5faf5d976411726661ba.tar.gz rtmux-74b958ecbed7102a0f3f5faf5d976411726661ba.tar.bz2 rtmux-74b958ecbed7102a0f3f5faf5d976411726661ba.zip |
Merge branch 'obsd-master'
Conflicts:
Makefile
Diffstat (limited to 'status.c')
-rw-r--r-- | status.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -503,7 +503,10 @@ status_replace(struct client *c, struct winlink *wl, const char *fmt, time_t t) if (fmt == NULL) return (xstrdup("")); - ft = format_create_status(1); + if (c->flags & CLIENT_STATUSFORCE) + ft = format_create_flags(FORMAT_STATUS|FORMAT_FORCE); + else + ft = format_create_flags(FORMAT_STATUS); format_defaults(ft, c, NULL, wl, NULL); expanded = format_expand_time(ft, fmt, t); |