mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
a bit more fixes for +k updating
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2906 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
1faed99b33
commit
fd6fe24317
@ -250,13 +250,14 @@ void parse_channel_modes(IRC_CHANNEL_REC *channel, const char *setby,
|
||||
channel->limit = type == '-' ? 0 : atoi(arg);
|
||||
break;
|
||||
case 'k':
|
||||
if (*arg == '\0' && type == '+') {
|
||||
if ((*arg == '\0' && type == '+') ||
|
||||
(channel->key != NULL && !update_key)) {
|
||||
arg = channel->key != NULL ? channel->key :
|
||||
"???";
|
||||
}
|
||||
mode_set_arg(newmode, type, 'k', arg);
|
||||
|
||||
if (arg != channel->key && update_key) {
|
||||
if (arg != channel->key) {
|
||||
g_free_and_null(channel->key);
|
||||
if (type == '+')
|
||||
channel->key = g_strdup(arg);
|
||||
|
Loading…
Reference in New Issue
Block a user