Fix MySQL crash on module unload with empty query queue

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

diff --git a/src/commands/cmd_part.cpp b/src/commands/cmd_part.cpp
index e9753c4563175cf76a1daa06c124a95f565f096b..ba8420cd69b063f40edd5f5e9493fadcb6924abd 100644 (file)
--- a/src/commands/cmd_part.cpp
+++ b/src/commands/cmd_part.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
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_PART_H__
-#define __CMD_PART_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /PART. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -31,7 +23,7 @@ class CommandPart : public Command
  public:
        /** Constructor for part.
         */
-       CommandPart (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"PART", 0, 1, false, 5) { syntax = "<channel>{,<channel>} [<reason>]"; }
+       CommandPart (Module* parent) : Command(parent,"PART", 1, 2) { Penalty = 5; syntax = "<channel>{,<channel>} [<reason>]"; }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -41,21 +33,18 @@ class CommandPart : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User *user)
 {
        std::string reason;
 
        if (IS_LOCAL(user))
        {
-               if (*ServerInstance->Config->FixedPart)
+               if (!ServerInstance->Config->FixedPart.empty())
                        reason = ServerInstance->Config->FixedPart;
                else
                {
                        if (parameters.size() > 1)
-                               reason = ServerInstance->Config->PrefixPart + std::string(parameters[1]) + ServerInstance->Config->SuffixPart;
+                               reason = ServerInstance->Config->PrefixPart + parameters[1] + ServerInstance->Config->SuffixPart;
                        else
                                reason = "";
                }
@@ -72,9 +61,7 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
 
        if (c)
        {
-               if (!c->PartUser(user, reason))
-                       /* Arse, who stole our channel! :/ */
-                       delete c;
+               c->PartUser(user, reason);
        }
        else
        {