IRC:

- useless variable m_evWndCreate removed;
- fixes #1628 (IRC channel list window crashes when closed prematurely);
- code cleaning;
- version bump

1 files changed, 4 insertions, 5 deletions

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index d1d79044e8..7d622ca3a0 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -458,7 +458,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM, LPARAM lParam)
 	GCHOOK *gch = (GCHOOK*)lParam;

 	CMStringW S = L"";

 

-	mir_cslock lock(m_gchook);

+	mir_cslock lock(m_csGcHook);

 

 	// handle the hook

 	if (gch) {

@@ -839,7 +839,7 @@ int __cdecl CIrcProto::GCMenuHook(WPARAM, LPARAM lParam)
 

 void CIrcProto::OnShutdown()

 {

-	mir_cslock lock(cs);

+	mir_cslock lock(m_csSession);

 

 	if (m_perform && IsConnected())

 		if (DoPerform("Event: Disconnect"))

@@ -944,7 +944,7 @@ void __cdecl CIrcProto::ConnectServerThread(void*)
 		ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)Temp, ID_STATUS_CONNECTING);

 		Sleep(100);

 		{

-			mir_cslock lock(cs);

+			mir_cslock lock(m_csSession);

 			Connect(si);

 		}

 		if (IsConnected()) {

@@ -969,10 +969,9 @@ void __cdecl CIrcProto::DisconnectServerThread(void*)
 {

 	Thread_SetName("IRC: DisconnectServer");

 

-	mir_cslock lck(cs);

+	mir_cslock lck(m_csSession);

 	if (IsConnected())

 		Disconnect();

-	return;

 }

 

 void CIrcProto::ConnectToServer(void)