Fix peavey and w00ts bug they found by removing the nonblocking part of the logger...

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

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 02dfb7c2f5989b2ddbdaf64e5a651cd39904c6fe..6385af9c092ffe10565648203a1b12988346b628 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -95,7 +95,7 @@ void SnomaskManager::SetupDefaults()
        this->EnableSnomask('K',"REMOTEKILL");                  /* Remote kill notices */
        this->EnableSnomask('l',"LINK");                        /* Link notices */
        this->EnableSnomask('o',"OPER");                        /* Oper up/down notices */
-       this->EnableSnomask('O',"ALLOPERS");                    /* WriteOpers() - generic notices to all opers */
+       this->EnableSnomask('A',"ANNOUNCEMENT");                /* formerly WriteOpers() - generic notices to all opers */
        this->EnableSnomask('d',"DEBUG");                       /* Debug notices */
        this->EnableSnomask('x',"XLINE");                       /* Xline notice (g/z/q/k/e) */
        this->EnableSnomask('t',"STATS");                       /* Local or remote stats request */
@@ -122,13 +122,13 @@ void Snomask::Flush()
        if (this->LastMessage.empty())
                return;
 
-       ServerInstance->Log(DEBUG, "Flusing snomask %s", this->Description.c_str());
+       ServerInstance->Logs->Log("SNOMASK", DEBUG, "Flushing snomask %s", this->Description.c_str());
 
        /* Only opers can receive snotices, so we iterate the oper list */
-       for (std::list<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+       for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++)
        {
                User* a = *i;
-               if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask))
+               if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask) && !a->quitting)
                {
                        a->WriteServ("NOTICE %s :*** %s: %s", a->nick, this->Description.c_str(), this->LastMessage.c_str());
                        if (Count > 1)