Automatically register ServiceProviders created by modules

2 files changed, 1 insertions, 3 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 1e59e1607..fed55d4fd 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -59,9 +59,6 @@ void ModuleSpanningTree::init()
 	Utils = new SpanningTreeUtilities(this);
 	Utils->TreeRoot = new TreeServer;
 	commands = new SpanningTreeCommands(this);
-	ServerInstance->Modules->AddService(commands->rconnect);
-	ServerInstance->Modules->AddService(commands->rsquit);
-	ServerInstance->Modules->AddService(commands->map);
 
 	delete ServerInstance->PI;
 	ServerInstance->PI = new SpanningTreeProtocolInterface;
diff --git a/src/modules/m_spanningtree/servercommand.cpp b/src/modules/m_spanningtree/servercommand.cpp
index fe5a38a9e..016788f51 100644
--- a/src/modules/m_spanningtree/servercommand.cpp
+++ b/src/modules/m_spanningtree/servercommand.cpp
@@ -24,6 +24,7 @@
 ServerCommand::ServerCommand(Module* Creator, const std::string& Name, unsigned int MinParams, unsigned int MaxParams)
 	: CommandBase(Creator, Name, MinParams, MaxParams)
 {
+	this->ServiceProvider::DisableAutoRegister();
 	ModuleSpanningTree* st = static_cast<ModuleSpanningTree*>(Creator);
 	st->CmdManager.AddCommand(this);
 }