Decide that it wasn't quite appropriate :(

[user/henk/code/inspircd.git] / src / modules / m_override.cpp

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index a16f8428e1599f8bf5285b6c8bbadf7956e8b0d0..8dfc5dd6f724b8825ce4ee53899dd2ae72df2840 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -86,7 +86,7 @@ class ModuleOverride : public Module
        {
                if ((*source->oper) && (CanOverride(source,"KICK")))
                {
-                       if (((Srv->ChanMode(source,channel) == "%") && (Srv->ChanMode(user,channel) == "@")) || (Srv->ChanMode(source,channel) == ""))
+                       if (((Srv->ChanMode(source,chan) == "%") && (Srv->ChanMode(user,chan) == "@")) || (Srv->ChanMode(source,chan) == ""))
                        {
                                Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
                        }
@@ -174,7 +174,7 @@ class ModuleOverride : public Module
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
-               if (strchr(user->modes,'o'))
+               if (*user->oper)
                {
                        if (chan)
                        {