Compressor script that compresses all shared objects and exe with upx, should be...

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index d640af1d826e1b1520af3cba22ce3e6e9545392b..11a5c944d0014e2540e43bde827b3557c114fae6 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -11,9 +11,9 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <stdarg.h>
 #include "configreader.h"
-#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
 #include "wildcard.h"
@@ -307,7 +307,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
        {
                return chanrec::ForceChan(Instance, Ptr, user, privs);
        }
-       else if (*user->oper)
+       else if (IS_OPER(user))
        {
                /* Oper allows extension up to the OperMaxchans value */
                if (user->chans.size() < Instance->Config->OperMaxChans)
@@ -844,6 +844,7 @@ void chanrec::UserList(userrec *user, CUList *ulist)
                        continue;
 
                size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str());
+               /* OnUserList can change this - reset it back to normal */
                i->second = i->first->nick;
 
                curlen += ptrlen;