diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
| commit | 8e9e2b7d9e54744cee32b3724391bf0ad04e8aff (patch) | |
| tree | 6cafdc57bb8143306daf8ef8288d09754f39b451 /irc_channel.c | |
| parent | 88de0c96136313e553113f69cfc6ae544a5f5954 (diff) | |
| parent | 2af3e232ff468b288dd4e0dbdab1a17312d801c5 (diff) | |
Merging mainline, which includes a huge msnp13 merge.
Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.
Diffstat (limited to 'irc_channel.c')
| -rw-r--r-- | irc_channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/irc_channel.c b/irc_channel.c index 80b1cb62..60426ac0 100644 --- a/irc_channel.c +++ b/irc_channel.c @@ -191,7 +191,7 @@ static char *set_eval_channel_type( set_t *set, char *value ) if( strcmp( value, "control" ) == 0 ) new = &control_channel_funcs; - else if( strcmp( value, "chat" ) == 0 ) + else if( ic != ic->irc->default_channel && strcmp( value, "chat" ) == 0 ) new = &irc_channel_im_chat_funcs; else return SET_INVALID; |