Fix regressions in can_send() caused by hooking it for override and modularized chann...

diff --git a/src/channel.c b/src/channel.c
index c301953bd9a3509c8a4b6c88eb482cb521aaca14..30f5583b65e2572eed4100e95fb2e5b55a05de82 100644 (file)
--- 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;