- massive code cleaning;

- fix for a crash on exit;
- version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@15753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 1 insertions, 3 deletions

diff --git a/protocols/EmLanProto/src/mlan.h b/protocols/EmLanProto/src/mlan.h
index 3eb65620d1..ed151e1212 100644
--- a/protocols/EmLanProto/src/mlan.h
+++ b/protocols/EmLanProto/src/mlan.h
@@ -96,7 +96,6 @@ private:
 	int m_nameLen;

 

 	mir_cs m_csAccessClass;

-	mir_cs m_csReceiveThreadLock;

 	mir_cs m_csAccessAwayMes;

 

 	void RequestStatus(bool answer = false, u_long m_addr = INADDR_BROADCAST);

@@ -161,8 +160,7 @@ private:
 

 		TFileConnection();

 		~TFileConnection();

-		void Lock() { mir_cslock lck(m_csAccess); }

-		void Terminate() { Lock(); m_state = FCS_TERMINATE; }

+		void Terminate() { m_state = FCS_TERMINATE; }

 		int Recv(bool halt = true);

 		int Send(u_char* buf, int size);

 		int SendRaw(u_char* buf, int size);