Merge branch 'master' into bip08
This commit is contained in:
commit
744ea7d03b
@ -1011,10 +1011,11 @@ static int irc_cli_join(struct link_client *irc, struct line *line)
|
|||||||
kp[klen] = 0;
|
kp[klen] = 0;
|
||||||
if (*ke == 0)
|
if (*ke == 0)
|
||||||
ks = NULL;
|
ks = NULL;
|
||||||
} else
|
} else {
|
||||||
kp = NULL;
|
kp = NULL;
|
||||||
ks = NULL;
|
ks = NULL;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
irc_add_channel_info(LINK(irc)->l_server, p, kp);
|
irc_add_channel_info(LINK(irc)->l_server, p, kp);
|
||||||
free(p);
|
free(p);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user