Resolve /STATS S conflict between SVSHOLD and SHUN

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

diff --git a/src/commands/cmd_quit.cpp b/src/commands/cmd_quit.cpp
index d041fc0315e6bf43d96648648f4ec416dd91ac18..b5d71d877170576a554f8da001e6726515e9f344 100644 (file)
--- a/src/commands/cmd_quit.cpp
+++ b/src/commands/cmd_quit.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,7 +41,7 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
 
        if (IS_LOCAL(user))
        {
-               if (*ServerInstance->Config->FixedQuit)
+               if (!ServerInstance->Config->FixedQuit.empty())
                        quitmsg = ServerInstance->Config->FixedQuit;
                else
                        quitmsg = parameters.size() ?
@@ -51,7 +51,7 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
        else
                quitmsg = parameters.size() ? parameters[0] : "Client exited";
 
-       std::string* operquit = User::OperQuit.get(user);
+       std::string* operquit = ServerInstance->OperQuit.get(user);
        if (operquit)
        {
                ServerInstance->Users->QuitUser(user, quitmsg, operquit->c_str());