Fix memory leaks on reloadmodule and spanningtree unload while connecting servers

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / save.cpp

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index 25f811267515fe15f10845816b968df66f8630e6..1fbea005287ce55d7c9e2a7a6d97a54bf3ec55d0 100644 (file)
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.cpp
@@ -12,11 +12,8 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -34,7 +31,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
        if (params.size() < 2)
                return true;
 
-       User* u = this->ServerInstance->FindNick(params[0]);
+       User* u = ServerInstance->FindNick(params[0]);
        time_t ts = atol(params[1].c_str());
 
        if (u && u->age == ts)
@@ -43,7 +40,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
 
                if (!u->ForceNickChange(u->uuid.c_str()))
                {
-                       this->ServerInstance->Users->QuitUser(u, "Nickname collision");
+                       ServerInstance->Users->QuitUser(u, "Nickname collision");
                }
        }