Only assign NewServices once the duplicate check is done.

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 13ede628afb83ffc9163b564d0b4305f600c5407..f15907b13e8dc43a059514e210bd06a5e388fd94 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -1,11 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007-2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -404,7 +407,7 @@ void TreeSocket::OnTimeout()
 
 void TreeSocket::Close()
 {
-       if (fd < 0)
+       if (!HasFd())
                return;
 
        ServerInstance->GlobalCulls.AddItem(this);
@@ -413,7 +416,7 @@ void TreeSocket::Close()
 
        // Connection closed.
        // If the connection is fully up (state CONNECTED)
-       // then propogate a netsplit to all peers.
+       // then propagate a netsplit to all peers.
        if (MyRoot)
                MyRoot->SQuit(getError(), true);