iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure the created favchannel instances have a NULL key when the session's key is empty

Browse Source
This commit is contained in:
Berke Viktor 2013-05-16 00:04:58 +02:00
parent 2ff8e74061
commit fd1b276aab
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/inbound.c
View File

@ -1105,7 +1105,15 @@ check_autojoin_channels (server *serv)
} }
} }
sess_channels = servlist_favchan_listadd (sess_channels, sess->waitchannel, sess->channelkey); /* for easier checks, ensure that favchannel->key is just NULL when session->channelkey is empty i.e. '' */
if (strlen (sess->channelkey))
{
sess_channels = servlist_favchan_listadd (sess_channels, sess->waitchannel, sess->channelkey);
}
else
{
sess_channels = servlist_favchan_listadd (sess_channels, sess->waitchannel, NULL);
}
i++; i++;
} }
} }

2
src/common/proto-irc.c
View File

@ -194,7 +194,7 @@ irc_join_list (server *serv, GSList *favorites)
g_string_append (chanlist, fav->name); g_string_append (chanlist, fav->name);
if (fav->key && strlen (fav->key)) /* strlen() is required since key can be '' for session->channelkey */ if (fav->key) /* strlen() is required since key can be '' for session->channelkey */
{ {
g_string_append (keylist, fav->key); g_string_append (keylist, fav->key);
send_keys = 1; send_keys = 1;