m_spanningtree Deduplicate server auth code

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 62bdedcfdbc9ed4b62814fa44fc8099005ecd59f..42a9e80102b620507a52a6c738879d0e1ae91de5 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -391,8 +391,8 @@ void ModuleManager::DoSafeUnload(Module* mod)
                ++c;
                mod->OnCleanup(TYPE_CHANNEL, chan);
                chan->doUnhookExtensions(items);
-               const UserMembList& users = chan->GetUsers();
-               for (UserMembCIter mi = users.begin(); mi != users.end(); ++mi)
+               const Channel::MemberMap& users = chan->GetUsers();
+               for (Channel::MemberMap::const_iterator mi = users.begin(); mi != users.end(); ++mi)
                        mi->second->doUnhookExtensions(items);
        }
 
@@ -515,7 +515,7 @@ void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
 {
        if (CanUnload(mod))
                ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-       else
+       else if (callback)
                callback->Call(false);
 }