core: force buffer property "time_for_each_line" to 0 for buffers with free content (closes #1485)

2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 3965458b4..45cc1798a 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -44,6 +44,7 @@ New features::
 
 Bug fixes::
 
+  * core: force buffer property "time_for_each_line" to 0 for buffers with free content (issue #1485)
   * core: don't collapse consecutive newlines in lines displayed before the first buffer is created
   * core: don't remove consecutive newlines when pasting text (issue #1500)
   * core: don't collapse consecutive newlines in bar content (issue #1500)
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 41a6791e0..b84dcea85 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -1376,8 +1376,19 @@ gui_buffer_set_type (struct t_gui_buffer *buffer, enum t_gui_buffer_type type)
     gui_line_free_all (buffer);
 
     buffer->type = type;
-    if (type == GUI_BUFFER_TYPE_FREE)
-        buffer->clear = 0;
+
+    switch (type)
+    {
+        case GUI_BUFFER_TYPE_FORMATTED:
+            buffer->time_for_each_line = 1;
+            break;
+        case GUI_BUFFER_TYPE_FREE:
+            buffer->clear = 0;
+            buffer->time_for_each_line = 0;
+            break;
+        case GUI_BUFFER_NUM_TYPES:
+            break;
+    }
 
     gui_buffer_ask_chat_refresh (buffer, 2);