Fix build errors on CentOS 6 and OpenBSD.

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

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index f77899ad4f8105edc521e732b148720d8fbb5f97..b3937b4a4e2adf6d430b2176ce23c32a1dadcf7b 100644 (file)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -245,11 +245,6 @@ class ModuleNationalChars : public Module
                RehashHashmap(ServerInstance->Users.clientlist);
                RehashHashmap(ServerInstance->Users.uuidlist);
                RehashHashmap(ServerInstance->chanlist);
-
-               // The OnGarbageCollect() method in m_watch rebuilds the hashmap used by it
-               Module* mod = ServerInstance->Modules->Find("m_watch.so");
-               if (mod)
-                       mod->OnGarbageCollect();
        }
 
  public:
@@ -292,10 +287,12 @@ class ModuleNationalChars : public Module
                        return;
 
                const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-               for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); ++iter)
+               for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); )
                {
                        /* Fix by Brain: Dont quit UID users */
+                       // Quitting the user removes it from the list
                        User* n = *iter;
+                       ++iter;
                        if (!isdigit(n->nick[0]) && !ServerInstance->IsNick(n->nick))
                                ServerInstance->Users->QuitUser(n, message);
                }