From b58f2f446a6acb22ebc3ed51acc2591c95d00569 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 9 Jul 2014 16:14:09 +0000
Subject: unused parameter removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@9748 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IcqOscarJ/src/icq_server.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'protocols/IcqOscarJ/src/icq_server.cpp')

diff --git a/protocols/IcqOscarJ/src/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp
index ebb6050c02..2a0e433761 100644
--- a/protocols/IcqOscarJ/src/icq_server.cpp
+++ b/protocols/IcqOscarJ/src/icq_server.cpp
@@ -210,26 +210,22 @@ void __cdecl CIcqProto::ServerThread(serverthread_start_info *infoParam)
 	debugLogA("%s thread ended.", "Server");
 }
 
-
-void CIcqProto::icq_serverDisconnect(BOOL bBlock)
+void CIcqProto::icq_serverDisconnect()
 {
-	if ( !hServerConn)
+	if (!hServerConn)
 		return;
 
 	debugLogA("Server shutdown requested");
 	Netlib_Shutdown(hServerConn);
 
+	debugLogA("Dropping server thread");
 	if (serverThreadHandle) {
-		// Not called from network thread?
-		if (bBlock && GetCurrentThreadId() != serverThreadId)
-			while (ICQWaitForSingleObject(serverThreadHandle, INFINITE) != WAIT_OBJECT_0);
-
+		debugLogA("Closing server thread handle: %08p", serverThreadHandle);
 		CloseHandle(serverThreadHandle);
 		serverThreadHandle = NULL;
 	}
 }
 
-
 int CIcqProto::handleServerPackets(BYTE *buf, int len, serverthread_info *info)
 {
 	BYTE channel;
@@ -328,7 +324,7 @@ void CIcqProto::sendServPacket(icq_packet *pPacket)
 			DWORD dwErrorCode = GetLastError();
 			if (dwErrorCode != WSAESHUTDOWN)
 				icq_LogUsingErrorCode(LOG_ERROR, GetLastError(), LPGEN("Your connection with the ICQ server was abortively closed"));
-			icq_serverDisconnect(FALSE);
+			icq_serverDisconnect();
 
 			if (m_iStatus != ID_STATUS_OFFLINE)
 				SetCurrentStatus(ID_STATUS_OFFLINE);
-- 
cgit v1.2.3