Fix MySQL crash on module unload with empty query queue

[user/henk/code/inspircd.git] / src / commands / cmd_unloadmodule.cpp

diff --git a/src/commands/cmd_unloadmodule.cpp b/src/commands/cmd_unloadmodule.cpp
index 5aecd22ddef0d1f924d642a7c227846bcd618fd3..0acc72248ae0f19a46d578ca78d9ff428a58fba3 100644 (file)
--- a/src/commands/cmd_unloadmodule.cpp
+++ b/src/commands/cmd_unloadmodule.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -41,14 +41,16 @@ CmdResult CommandUnloadmodule::Handle (const std::vector<std::string>& 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;
        }