forked from PsychoticNinja/irssi
/SERVER -ssl option was lost while reconnecting if server existed in /SERVER
LIST without SSL. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2894 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
ab8e46f19d
commit
1c33e3e896
@ -108,8 +108,6 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn,
|
|||||||
if (sserver->password != NULL && conn->password == NULL)
|
if (sserver->password != NULL && conn->password == NULL)
|
||||||
conn->password = g_strdup(sserver->password);
|
conn->password = g_strdup(sserver->password);
|
||||||
|
|
||||||
conn->use_ssl = sserver->use_ssl;
|
|
||||||
|
|
||||||
signal_emit("server setup fill reconn", 2, conn, sserver);
|
signal_emit("server setup fill reconn", 2, conn, sserver);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -165,6 +163,8 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
|
|||||||
conn->family = sserver->family;
|
conn->family = sserver->family;
|
||||||
if (sserver->port > 0 && conn->port <= 0)
|
if (sserver->port > 0 && conn->port <= 0)
|
||||||
conn->port = sserver->port;
|
conn->port = sserver->port;
|
||||||
|
conn->use_ssl = sserver->use_ssl;
|
||||||
|
|
||||||
server_setup_fill_reconn(conn, sserver);
|
server_setup_fill_reconn(conn, sserver);
|
||||||
|
|
||||||
signal_emit("server setup fill server", 2, conn, sserver);
|
signal_emit("server setup fill server", 2, conn, sserver);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user