Merge branch 'mintaka' into general-devel

Pryaxis · Dec 14, 2016 · bcd00c0 · bcd00c0
2 parents 564a80c + d8118f2
commit bcd00c0
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/TShockAPI/Sockets/LinuxTcpSocket.cs b/TShockAPI/Sockets/LinuxTcpSocket.cs
@@ -73,7 +73,20 @@ void ISocket.Connect(RemoteAddress address)
 		private void ReadCallback(IAsyncResult result)
 		{
 			Tuple<SocketReceiveCallback, object> tuple = (Tuple<SocketReceiveCallback, object>)result.AsyncState;
-			tuple.Item1(tuple.Item2, this._connection.GetStream().EndRead(result));
+
+			try
+			{
+				tuple.Item1(tuple.Item2, this._connection.GetStream().EndRead(result));
+			}
+			catch (InvalidOperationException)
+			{
+				// This is common behaviour during client disconnects
+				((ISocket)this).Close();
+			}
+			catch (Exception ex)
+			{
+				TShock.Log.Error(ex.ToString());
+			}
 		}
 
 		private void SendCallback(IAsyncResult result)