mirror of
https://github.com/irssi/irssi.git
synced 2026-08-17 23:52:22 +02:00
/UPGRADE didn't work properly when you were connected to multiple servers.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2080 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
5656ad352d
commit
78f9c141dc
2 changed files with 22 additions and 35 deletions
|
|
@ -198,11 +198,11 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
|
|||
|
||||
handle = NULL;
|
||||
if (ip != NULL) {
|
||||
/* allow "server connecting" signal to create the
|
||||
connection handle */
|
||||
signal_emit("server connecting", 3, server, ip, &handle);
|
||||
if (handle == NULL)
|
||||
signal_emit("server connecting", 2, server, ip);
|
||||
if (server->handle == NULL)
|
||||
handle = net_connect_ip(ip, port, own_ip);
|
||||
else
|
||||
handle = net_sendbuffer_handle(server->handle);
|
||||
}
|
||||
|
||||
if (handle == NULL) {
|
||||
|
|
@ -227,7 +227,8 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
|
|||
return;
|
||||
}
|
||||
|
||||
server->handle = net_sendbuffer_create(handle, 0);
|
||||
if (server->handle == NULL)
|
||||
server->handle = net_sendbuffer_create(handle, 0);
|
||||
server->connect_tag =
|
||||
g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
|
||||
(GInputFunction) server_connect_callback_init,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue