From b498062fdec309bb045485657fba02e9fb958e41 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 23 Mar 2007 13:39:23 +0000 Subject: [PATCH] Fixed crash when closing a pv if a DCC chat is open on same nick (bug #19147) --- ChangeLog | 5 ++++- src/common/command.c | 3 +-- weechat/ChangeLog | 5 ++++- weechat/src/common/command.c | 3 +-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f855a62e0..16295e276 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,13 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-03-22 +ChangeLog - 2007-03-23 Version 0.2.4 (under dev!): + * renamed log file for DCC chat (now .dcc..weechatlog) + * fixed crash when closing a pv if a DCC chat is open on same nick + (bug #19147) * fixed bug with channel topic after reconnection (not erased) (bug #19384) * added current buffer in hotlist when scrolling up in buffer (task #6664) * fixed bug with explode_string / free_exploded_string when max_items > 0 diff --git a/src/common/command.c b/src/common/command.c index b96cac9e6..372993d9f 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -1214,8 +1214,7 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel, } else { - ptr_channel = channel_search_any (SERVER(buffer), - CHANNEL(buffer)->name); + ptr_channel = CHANNEL(buffer); ptr_server = SERVER(buffer); gui_buffer_free (buffer, 1); if (ptr_channel) diff --git a/weechat/ChangeLog b/weechat/ChangeLog index f855a62e0..16295e276 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,13 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-03-22 +ChangeLog - 2007-03-23 Version 0.2.4 (under dev!): + * renamed log file for DCC chat (now .dcc..weechatlog) + * fixed crash when closing a pv if a DCC chat is open on same nick + (bug #19147) * fixed bug with channel topic after reconnection (not erased) (bug #19384) * added current buffer in hotlist when scrolling up in buffer (task #6664) * fixed bug with explode_string / free_exploded_string when max_items > 0 diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index b96cac9e6..372993d9f 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -1214,8 +1214,7 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel, } else { - ptr_channel = channel_search_any (SERVER(buffer), - CHANNEL(buffer)->name); + ptr_channel = CHANNEL(buffer); ptr_server = SERVER(buffer); gui_buffer_free (buffer, 1); if (ptr_channel)