moved SB async handle cleanup

Author: chc

code/core/OS/Net/NetPeer.h

@@ -50,7 +50,7 @@ class INetPeer : public OS::Ref, public OS::LinkedList<INetPeer *> {
 		static void write_callback(uv_write_t *req, int status);
 
 		static void close_callback(uv_handle_t *handle);
-		void CloseSocket();
+		virtual void CloseSocket();
 	protected:
 		static void read_alloc_cb(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) {
 			buf->base = (char*)malloc(suggested_size);

code/serverbrowsing/server/SBPeer.cpp

@@ -92,11 +92,19 @@ namespace SB {
 		peer->FlushPendingRequests();
 	}
 
-	void Peer::Delete(bool timeout) {
-		if(!m_delete_flag) {
+	/*
+		This override exists to close the handle in the main thread, as this CloseSocket is only called there
+
+		while this was originally only for sockets, it should maybe be renamed CloseHandles
+	*/
+	void Peer::CloseSocket() {
+		if(!m_socket_deleted) { //this will get set to true by INetPeer::CloseSocket on first call, so its only ever called once
 			IncRef();
 			uv_close((uv_handle_t*)&mp_pending_request_flush_async, close_callback);
 		}
+		INetPeer::CloseSocket();
+	}
+	void Peer::Delete(bool timeout) {
 		m_timeout_flag = timeout;
 		m_delete_flag = true;
 	}

code/serverbrowsing/server/SBPeer.h

@@ -48,6 +48,7 @@ namespace SB {
 		virtual void OnRecievedGameInfoPair(const OS::GameData game_data_first, const OS::GameData game_data_second, void *extra) = 0;
 
 		virtual void Delete(bool timeout = false);
+		void CloseSocket();
 	protected:
 		int m_version;