summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2015-06-14 14:11:15 +0200
committerSébastien Helleu <flashcode@flashtux.org>2015-06-14 14:11:15 +0200
commit60ec9d5d5194896686d729062bd7e26796c426d6 (patch)
tree8644144ce3c0603d007f534e404158a13760bb04
parentc8ac7e37917bb33916af479ddc67f4a89bc1e100 (diff)
downloadweechat-60ec9d5d5194896686d729062bd7e26796c426d6.zip
core: fix display of time in bare display when option weechat.look.buffer_time_format is set to empty string (closes #441)
This reverts commit 2498ff63dba0ad3880fc3dadcac6b36f047ac0e2.
-rw-r--r--ChangeLog.asciidoc2
-rw-r--r--src/gui/curses/gui-curses-chat.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 41323d784..2c4ecc8de 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -25,6 +25,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
=== Bugs fixed
+* core: fix display of time in bare display when option
+ weechat.look.buffer_time_format is set to empty string (closes #441)
* fifo: fix send error on Cygwin when something is received in the pipe
(closes #436)
* irc: fix errors displayed on WHOX messages received (closes #376)
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 51d30c7a0..a662d4b24 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -1905,8 +1905,6 @@ 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])
{