summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2006-04-23 09:22:53 +0000
committerSebastien Helleu <flashcode@flashtux.org>2006-04-23 09:22:53 +0000
commit23f3622f2ce48b64c2d373d6a018cdf3d696d631 (patch)
tree00f0789fe405cd3ae6a967e50e08473ba178da1e /src/common
parent6021ee85cb3c13754a0f205469824e7f9fb0df69 (diff)
downloadweechat-23f3622f2ce48b64c2d373d6a018cdf3d696d631.zip
Fixed bug #16369: fixed crash when multiple pv have same name: now it's forbidden and pv buffer is not renamed (when a nick changes) if another exists with same name
Diffstat (limited to 'src/common')
-rw-r--r--src/common/command.c9
-rw-r--r--src/common/session.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/common/command.c b/src/common/command.c
index 86d729fbe..5d18619ab 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -1371,7 +1371,8 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel,
buffer->server = NULL;
gui_window_switch_server (window);
}
-
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
}
else
{
@@ -1381,8 +1382,8 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel,
ptr_channel = CHANNEL(buffer);
gui_buffer_free (ptr_channel->buffer, 1);
channel_free (SERVER(buffer), ptr_channel);
- gui_status_draw (buffer, 1);
- gui_input_draw (buffer, 1);
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
}
else
{
@@ -1412,9 +1413,9 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel,
}
else
gui_buffer_free (buffer, 1);
+ gui_status_draw (gui_current_window->buffer, 1);
}
}
- gui_status_draw (buffer, 1);
}
else if (ascii_strcasecmp (argv[0], "notify") == 0)
{
diff --git a/src/common/session.c b/src/common/session.c
index 3b4829b2e..3f24dc58a 100644
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -1403,7 +1403,7 @@ session_load_buffer (FILE *file)
if (channel_name)
{
- ptr_channel = channel_search_any (ptr_server, channel_name);
+ ptr_channel = channel_search_any_without_buffer (ptr_server, channel_name);
if (!ptr_channel)
{
session_crash (file, _("channel not found for buffer"));