From e06988c6dedbc06172a70e4d2afdb3f42fee5381 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 11 Dec 2010 20:21:47 -0600 Subject: [PATCH] Fix regressions in can_send() caused by hooking it for override and modularized channel modules. --- src/channel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/channel.c b/src/channel.c index c301953b..30f5583b 100644 --- a/src/channel.c +++ b/src/channel.c @@ -853,9 +853,6 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt } } - if(is_chanop_voiced(msptr)) - moduledata.approved = CAN_SEND_OPV; - if(chptr->mode.mode & MODE_MODERATED) moduledata.approved = CAN_SEND_NO; @@ -872,6 +869,9 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt moduledata.approved = CAN_SEND_NO; } + if(is_chanop_voiced(msptr)) + moduledata.approved = CAN_SEND_OPV; + call_hook(h_can_send, &moduledata); return moduledata.approved;