diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/inbound.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/common/inbound.c b/src/common/inbound.c index 59ffaf2b..1c124db4 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -1028,6 +1028,8 @@ check_autojoin_channels (server *serv) /* this is really only for re-connects when you * join channels not in the auto-join list. */ + channels = NULL; + keys = NULL; while (list) { sess = list->data; @@ -1037,18 +1039,28 @@ check_autojoin_channels (server *serv) { strcpy (sess->waitchannel, sess->willjoinchannel); sess->willjoinchannel[0] = 0; - serv->p_join (serv, sess->waitchannel, sess->channelkey); + po = strchr (sess->waitchannel, ','); if (po) *po = 0; po = strchr (sess->waitchannel, ' '); if (po) *po = 0; + + channels = g_slist_append (channels, g_strdup (sess->waitchannel)); + keys = g_slist_append (keys, g_strdup (sess->channelkey)); i++; } } list = list->next; } + + if (channels) + { + serv->p_join_list (serv, channels, keys); + joinlist_free (channels, keys); + } + serv->joindelay_tag = 0; fe_server_event (serv, FE_SE_LOGGEDIN, i); return FALSE; |