summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2011-08-05 13:23:43 +0200
committerSebastien Helleu <flashcode@flashtux.org>2011-08-05 13:23:43 +0200
commit982db541ec2ef715dc9ff3fcb6830e76980c6740 (patch)
tree9cdff8c1fd137771c35d25ca176e359644012917
parentd27c459c1df88400f64311eedb30c5035d6334b9 (diff)
downloadweechat-982db541ec2ef715dc9ff3fcb6830e76980c6740.zip
core: fix unwanted merge of buffers when no layout number is assigned to buffer
-rw-r--r--src/gui/gui-buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 75cd34294..62a1a0d7c 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -332,7 +332,7 @@ gui_buffer_insert (struct t_gui_buffer *buffer, int automatic_merge)
}
/* merge buffer with previous or next, if they have layout number */
- if (automatic_merge)
+ if (automatic_merge && (buffer->layout_number >= 1))
{
if (buffer->prev_buffer
&& (buffer->layout_number == (buffer->prev_buffer)->layout_number))