themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'mintaka' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2016-12-14 14:18:11 -07:00
commit bcd00c0243
No known key found for this signature in database
GPG key ID: CEE668CCE1BF2C7C
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
TShockAPI/Sockets/LinuxTcpSocket.cs
View file

@ -73,7 +73,20 @@ namespace TShockAPI.Sockets
private void ReadCallback(IAsyncResult result) private void ReadCallback(IAsyncResult result)
{ {
Tuple<SocketReceiveCallback, object> tuple = (Tuple<SocketReceiveCallback, object>)result.AsyncState; 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) private void SendCallback(IAsyncResult result)