diff options
Diffstat (limited to 'src/modules.cpp')
| -rw-r--r-- | src/modules.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules.cpp b/src/modules.cpp index 567aa917c..5c5e5c5c0 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -363,6 +363,10 @@ void ModuleManager::DoSafeUnload(Module* mod) std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile); + // Unregister modes before extensions because modes may require their extension to show the mode being unset + UnregisterModes(mod, MODETYPE_USER); + UnregisterModes(mod, MODETYPE_CHANNEL); + std::vector<reference<ExtensionItem> > items; ServerInstance->Extensions.BeginUnregister(modfind->second, items); /* Give the module a chance to tidy out all its metadata */ @@ -388,9 +392,6 @@ void ModuleManager::DoSafeUnload(Module* mod) user->doUnhookExtensions(items); } - UnregisterModes(mod, MODETYPE_USER); - UnregisterModes(mod, MODETYPE_CHANNEL); - for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); ) { std::multimap<std::string, ServiceProvider*>::iterator curr = i++; |