From 4ec65c6231df9fcb38210f9b885cdf73b72cc176 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Sun, 9 Feb 2014 17:17:04 +0100
Subject: Call DelFd() and SetFd(-1) from SocketEngine::Close(EventHandler*)

---
 src/modules/m_ident.cpp                       | 4 +---
 src/modules/m_spanningtree/override_squit.cpp | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index bea4c2803..67065bd62 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -195,9 +195,7 @@ class IdentRequestSocket : public EventHandler
 		if (GetFd() > -1)
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Close ident socket %d", GetFd());
-			SocketEngine::DelFd(this);
-			SocketEngine::Close(GetFd());
-			this->SetFd(-1);
+			SocketEngine::Close(this);
 		}
 	}
 
diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index 2bae80927..84cb01f50 100644
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -42,7 +42,6 @@ ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parame
 		{
 			ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0].c_str(),user->nick.c_str());
 			sock->Squit(s,"Server quit by " + user->GetFullRealHost());
-			SocketEngine::DelFd(sock);
 			sock->Close();
 		}
 		else
-- 
cgit v1.3.1-10-gc9f91