diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2014-10-22 21:35:33 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2014-10-22 21:35:33 +0200 |
| commit | 2498ff63dba0ad3880fc3dadcac6b36f047ac0e2 (patch) | |
| tree | d8cf68a36844c1a167a74293d8d89e12d98fab1d | |
| parent | 633a32ccd367bdb7e2f97066a4d35f01ecb8e8fb (diff) | |
| download | weechat-2498ff63dba0ad3880fc3dadcac6b36f047ac0e2.zip | |
core: display time in bare display only if option weechat.look.buffer_time_format is not an empty string
| -rw-r--r-- | ChangeLog.asciidoc | 2 | ||||
| -rw-r--r-- | src/gui/curses/gui-curses-chat.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 3db27131b..1f3b70a90 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -35,6 +35,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] === Bugs fixed +* core: display time in bare display only if option + weechat.look.buffer_time_format is not an empty string * core: fix translation of message displayed after /upgrade * irc: add tag "nick_xxx" in invite messages * irc: fix completion of commands /msg, /notice and /query diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index df8841a9e..bdc14f25a 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -1896,6 +1896,8 @@ gui_chat_get_bare_line (struct t_gui_line *line) str_time[0] = '\0'; if (line->data->buffer->time_for_each_line && (line->data->date > 0) + && CONFIG_STRING(config_look_buffer_time_format) + && CONFIG_STRING(config_look_buffer_time_format)[0] && CONFIG_STRING(config_look_bare_display_time_format) && CONFIG_STRING(config_look_bare_display_time_format)[0]) { |