From 99a324b76f4dd91e15e6ccabf7ae5b97927105c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Wed, 10 Jun 2020 20:39:07 +0200 Subject: [PATCH] buflist: add "window" pointer in bar item evaluation only if it's not NULL (if bar type is "window") --- ChangeLog.adoc | 1 + src/plugins/buflist/buflist-bar-item.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index be61cbd1f..221414364 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -60,6 +60,7 @@ Bug fixes:: * core: fix resize of a bar when its size is 0 (automatic) (issue #1470) * api: fix use of pointer after free in function key_unbind * api: replace plugin and buffer name by buffer pointer in argument "modifier_data" sent to weechat_print modifier callback (issue #42) + * buflist: add "window" pointer in bar item evaluation only if it's not NULL (if bar type is "window") * exec: fix use of same task id for different tasks (issue #1491) * fifo: fix errors when writing in the FIFO pipe (issue #713) * guile: enable again /guile eval (issue #1514) diff --git a/src/plugins/buflist/buflist-bar-item.c b/src/plugins/buflist/buflist-bar-item.c index 527805fb8..e82fc18bc 100644 --- a/src/plugins/buflist/buflist-bar-item.c +++ b/src/plugins/buflist/buflist-bar-item.c @@ -327,7 +327,8 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, item_index = (int)((unsigned long)pointer); weechat_hashtable_set (buflist_hashtable_pointers, "bar_item", item); - weechat_hashtable_set (buflist_hashtable_pointers, "window", window); + if (window) + weechat_hashtable_set (buflist_hashtable_pointers, "window", window); ptr_format = buflist_config_format_buffer_eval; ptr_format_current = buflist_config_format_buffer_current_eval;