From dbf4d595433ecefeb61f1267ffa515a91c3ab548 Mon Sep 17 00:00:00 2001 From: danieldg Date: Wed, 14 Oct 2009 22:12:55 +0000 Subject: Fix module unmapping with culled Module objects git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11875 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/commands/cmd_unloadmodule.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/commands/cmd_unloadmodule.cpp') diff --git a/src/commands/cmd_unloadmodule.cpp b/src/commands/cmd_unloadmodule.cpp index 5aecd22dd..c3ae49d1c 100644 --- a/src/commands/cmd_unloadmodule.cpp +++ b/src/commands/cmd_unloadmodule.cpp @@ -41,14 +41,16 @@ CmdResult CommandUnloadmodule::Handle (const std::vector& parameter return CMD_FAILURE; } - if (ServerInstance->Modules->Unload(parameters[0].c_str())) + Module* m = ServerInstance->Modules->Find(parameters[0]); + if (m && ServerInstance->Modules->Unload(m)) { ServerInstance->SNO->WriteGlobalSno('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str()); user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick.c_str(), parameters[0].c_str()); } else { - user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str()); + user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), + m ? ServerInstance->Modules->LastError().c_str() : "No such module"); return CMD_FAILURE; } -- cgit v1.3.1-10-gc9f91