Probably wont compile yet - purge_empty_channels refactor

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

diff --git a/src/modules/m_operwho.cpp b/src/modules/m_operwho.cpp
index 7842fd08fd8251add58941a0b4cc81db4e46f885..8926b2a9c8f406de924742304828e514d6337433 100644 (file)
--- a/src/modules/m_operwho.cpp
+++ b/src/modules/m_operwho.cpp
@@ -64,7 +64,7 @@ class ModuleOperWho : public Module
        virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated)
        {
 
-               if (!*user->oper)
+               if ((!*user->oper) || (command != "WHO"))
                        return 0;
 
                chanrec* Ptr = NULL;
@@ -128,7 +128,7 @@ class ModuleOperWho : public Module
                                {
                                        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
                                        {
-                                               if ((has_channel(i->second,Ptr)) && (isnick(i->second->nick)))
+                                               if ((Ptr->HasUser(i->second)) && (isnick(i->second->nick)))
                                                {
                                                        // Fix Bug #29 - Part 2..
                                                        *tmp = 0;