Fix loading encoding from network list on connect

- Fix setting new encoding when switching networks
- Ignore ports when looking for network by hostname
- Only set UTF-8 when nothing explicitly set

Fixes #1628
This commit is contained in:
Patrick Griffis
2016-03-11 02:15:42 -05:00
parent ebb0fd6905
commit 7c078db879
3 changed files with 17 additions and 6 deletions

View File

@ -3439,10 +3439,9 @@ cmd_server (struct session *sess, char *tbuf, char *word[], char *word_eol[])
}
/* try to associate this connection with a listed network */
if (!serv->network)
/* search for this hostname in the entire server list */
serv->network = servlist_net_find_from_server (server_name);
/* may return NULL, but that's OK */
/* may return NULL, but that's OK */
if ((serv->network = servlist_net_find_from_server (server_name)))
server_set_encoding (serv, ((ircnet*)serv->network)->encoding);
return TRUE;
}