summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2011-02-22 10:26:18 +0100
committerSebastien Helleu <flashcode@flashtux.org>2011-02-22 10:26:18 +0100
commit4680ae40b6c668134e40c2244b2f1f6ec7f1e998 (patch)
tree16dbc5e4a97cffd14e2cc6a404d135b9c5fb02a0
parent2ad3a1c326ea0fb06b18f23ca8114fdcb30676d4 (diff)
downloadweechat-4680ae40b6c668134e40c2244b2f1f6ec7f1e998.zip
Fix crash when using column filling in bars with some empty items (bug #32565)
-rw-r--r--ChangeLog4
-rw-r--r--src/gui/gui-bar-window.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 807adefb1..d12d5a45c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-dev, 2011-02-21
+v0.3.5-dev, 2011-02-22
Version 0.3.5 (under dev!)
--------------------------
+* core: fix crash when using column filling in bars with some empty items
+ (bug #32565)
* core: allow relative size for command /window resize
* core: add some default keys for gnome-terminal (home/end, ctrl+up/down,
alt+pgup/pgdn)
diff --git a/src/gui/gui-bar-window.c b/src/gui/gui-bar-window.c
index 60e943944..58cca2112 100644
--- a/src/gui/gui-bar-window.c
+++ b/src/gui/gui-bar-window.c
@@ -557,7 +557,7 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
}
}
else
- split_items[i] = NULL;
+ split_items[i][sub] = NULL;
}
}
else