diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-02-14 23:54:07 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-02-14 23:54:07 +0000 |
commit | ffb83d23e17e99589f46edc3e08f78dd32936e4e (patch) | |
tree | eaa685cd8ce41ba6c3114037bf42d22999ae4f9a /status.c | |
parent | b4750e4c352f70ce515bed1279d8561a288f1f1b (diff) | |
parent | 4d05d8830482f8d5b5f812d082f1332090fcf027 (diff) | |
download | rtmux-ffb83d23e17e99589f46edc3e08f78dd32936e4e.tar.gz rtmux-ffb83d23e17e99589f46edc3e08f78dd32936e4e.tar.bz2 rtmux-ffb83d23e17e99589f46edc3e08f78dd32936e4e.zip |
Merge branch 'obsd-master'
Conflicts:
Makefile
Diffstat (limited to 'status.c')
-rw-r--r-- | status.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -758,9 +758,9 @@ status_prompt_set(struct client *c, const char *msg, const char *input, status_message_clear(c); status_prompt_clear(c); - c->prompt_string = format_expand_time(ft, msg, time(NULL)); + c->prompt_string = format_expand_time(ft, msg, t); - c->prompt_buffer = format_expand_time(ft, input, time(NULL)); + c->prompt_buffer = format_expand_time(ft, input, t); c->prompt_index = strlen(c->prompt_buffer); c->prompt_callbackfn = callbackfn; @@ -817,10 +817,10 @@ status_prompt_update(struct client *c, const char *msg, const char *input) t = time(NULL); free(c->prompt_string); - c->prompt_string = format_expand_time(ft, msg, time(NULL)); + c->prompt_string = format_expand_time(ft, msg, t); free(c->prompt_buffer); - c->prompt_buffer = format_expand_time(ft, input, time(NULL)); + c->prompt_buffer = format_expand_time(ft, input, t); c->prompt_index = strlen(c->prompt_buffer); c->prompt_hindex = 0; |