summaryrefslogtreecommitdiff
path: root/src/plugins/irc/irc-channel.c
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2018-05-20 15:21:07 +0200
committerSébastien Helleu <flashcode@flashtux.org>2018-05-20 15:21:07 +0200
commitafb1d0305313edef297e2f1f6ced9058a4560556 (patch)
tree789625c55c21c377a2618c709bfef2b56ad90693 /src/plugins/irc/irc-channel.c
parent0329a9c7cde1334d0de17440b6d2d304bdf2e6eb (diff)
parent0a348f0b9dd31fe8546e61d445f23b44a26d1abf (diff)
downloadweechat-afb1d0305313edef297e2f1f6ced9058a4560556.zip
Merge remote-tracking branch 'origin/pr/623' into irc-3.2-cap
Diffstat (limited to 'src/plugins/irc/irc-channel.c')
-rw-r--r--src/plugins/irc/irc-channel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index 4b6534c5e..ab24038a0 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -699,8 +699,8 @@ irc_channel_check_whox (struct t_irc_server *server,
{
if ((channel->type == IRC_CHANNEL_TYPE_CHANNEL) && channel->nicks)
{
- if (server->cap_away_notify
- || server->cap_account_notify
+ if (weechat_hashtable_has_key (server->cap_list, "away-notify")
+ || weechat_hashtable_has_key (server->cap_list, "account-notify")
|| ((IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK) > 0)
&& ((IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS) == 0)
|| (channel->nicks_count <= IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS)))))