X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=5c5e5c5c03c9c67e371a6a49954d05ed1d06ec8f;hb=3b595d39a50e38283768bc6ec8aeb9e73071224f;hp=b107a4b439d801174495267854284ac7e002eda6;hpb=761e6d75ba37b984998952940ed681e79e456142;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index b107a4b43..5c5e5c5c0 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -137,7 +137,7 @@ void 		Module::OnText(User*, void*, int, const std::string&, char, CUList&) { De
 ModResult	Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { DetachEvent(I_OnNamesListItem); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnNumeric(User*, const Numeric::Numeric&) { DetachEvent(I_OnNumeric); return MOD_RES_PASSTHRU; }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { DetachEvent(I_OnAcceptConnection); return MOD_RES_PASSTHRU; }
-void		Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Membership*, std::string&) { DetachEvent(I_OnSendWhoLine); }
+ModResult	Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Membership*, Numeric::Numeric&) { DetachEvent(I_OnSendWhoLine); return MOD_RES_PASSTHRU; }
 void		Module::OnSetUserIP(LocalUser*) { DetachEvent(I_OnSetUserIP); }
 
 #ifdef INSPIRCD_ENABLE_TESTSUITE
@@ -342,6 +342,18 @@ bool ModuleManager::CanUnload(Module* mod)
 	return true;
 }
 
+void ModuleManager::UnregisterModes(Module* mod, ModeType modetype)
+{
+	const ModeParser::ModeHandlerMap& modes = ServerInstance->Modes.GetModes(modetype);
+	for (ModeParser::ModeHandlerMap::const_iterator i = modes.begin(); i != modes.end(); )
+	{
+		ModeHandler* const mh = i->second;
+		++i;
+		if (mh->creator == mod)
+			this->DelService(*mh);
+	}
+}
+
 void ModuleManager::DoSafeUnload(Module* mod)
 {
 	// First, notify all modules that a module is about to be unloaded, so in case
@@ -351,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 */
@@ -376,24 +392,6 @@ void ModuleManager::DoSafeUnload(Module* mod)
 		user->doUnhookExtensions(items);
 	}
 
-	const ModeParser::ModeHandlerMap& usermodes = ServerInstance->Modes->GetModes(MODETYPE_USER);
-	for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); )
-	{
-		ModeHandler* mh = i->second;
-		++i;
-		if (mh->creator == mod)
-			this->DelService(*mh);
-	}
-
-	const ModeParser::ModeHandlerMap& chanmodes = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL);
-	for (ModeParser::ModeHandlerMap::const_iterator i = chanmodes.begin(); i != chanmodes.end(); )
-	{
-		ModeHandler* mh = i->second;
-		++i;
-		if (mh->creator == mod)
-			this->DelService(*mh);
-	}
-
 	for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
 	{
 		std::multimap<std::string, ServiceProvider*>::iterator curr = i++;