1 files changed, 5 insertions, 1 deletions

diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index f5b7faede..8129d6a50 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -376,9 +376,13 @@ private:
 	Protected by m_CSIncomingData. */
 	AString m_IncomingData;
 
-	/** Protects data going out through m_Link against multi-threaded sending. */
+	/** Protects m_OutgoingData against multithreaded access. */
 	cCriticalSection m_CSOutgoingData;
 
+	/** Buffer for storing outgoing data from any thread; will get sent in Tick() (to prevent deadlocks).
+	Protected by m_CSOutgoingData. */
+	AString m_OutgoingData;
+
 	Vector3d m_ConfirmPosition;
 
 	cPlayer * m_Player;