aboutsummaryrefslogtreecommitdiff
path: root/status.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-09-14 12:42:19 +0100
committerThomas Adam <thomas@xteddy.org>2015-09-14 12:42:19 +0100
commit74b958ecbed7102a0f3f5faf5d976411726661ba (patch)
tree7b0cc592b9127fe05afc9bbbf67263489d66eb85 /status.c
parentef35c9f7659205659d6863058b9a7262b21440a5 (diff)
parent16efa8483888e326aed2c05a01b63b45a2b118ef (diff)
downloadrtmux-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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/status.c b/status.c
index 29cb686c..7a1d2818 100644
--- a/status.c
+++ b/status.c
@@ -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);