aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Update irc-nicklist.c

Browse Source 
move altnick check before the nick correction code
This commit is contained in:
ailin-nemui 2018-01-05 00:38:54 +01:00 committed by GitHub
parent dee7825f05
commit 3c7185c5ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/irc/core/irc-nicklist.c
View File

@ -345,6 +345,7 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
{ {
char *str, *cmd, *params, *nick; char *str, *cmd, *params, *nick;
int n; int n;
gboolean try_alternate_nick;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -352,6 +353,10 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
/* Already connected, no need to handle this anymore. */ /* Already connected, no need to handle this anymore. */
return; return;
} }
try_alternate_nick = g_ascii_strcasecmp(server->nick, server->connrec->nick) == 0 &&
server->connrec->alternate_nick != NULL &&
g_ascii_strcasecmp(server->connrec->alternate_nick, server->nick) != 0;
params = event_get_params(data, 2, NULL, &nick); params = event_get_params(data, 2, NULL, &nick);
if (g_ascii_strcasecmp(server->nick, nick) != 0) { if (g_ascii_strcasecmp(server->nick, nick) != 0) {
@ -362,9 +367,7 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
g_free(params); g_free(params);
/* nick already in use - need to change it .. */ /* nick already in use - need to change it .. */
if (g_ascii_strcasecmp(server->nick, server->connrec->nick) == 0 && if (try_alternate_nick) {
server->connrec->alternate_nick != NULL &&
g_ascii_strcasecmp(server->connrec->alternate_nick, server->nick) != 0) {
/* first try, so try the alternative nick.. */ /* first try, so try the alternative nick.. */
g_free(server->nick); g_free(server->nick);
server->nick = g_strdup(server->connrec->alternate_nick); server->nick = g_strdup(server->connrec->alternate_nick);