github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not allow ObjectDisposed exceptions to trigger disconnectreason

Browse Source
This commit is contained in:
Brandon Smith
2015-09-04 19:32:26 -03:00
parent 8f7492c246
commit f6dacb7a84
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net/DiscordWebSocket.cs
View File

@@ -146,11 +146,11 @@ namespace Discord
if (_webSocket.State != WebSocketState.Open || cancelToken.IsCancellationRequested) if (_webSocket.State != WebSocketState.Open || cancelToken.IsCancellationRequested)
return; return;
try try
{ {
result = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), cancelToken); result = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), cancelToken);
} }
catch (Win32Exception ex) catch (Win32Exception ex)
when (ex.HResult == HR_TIMEOUT) when (ex.HResult == HR_TIMEOUT)
{ {
string msg = $"Connection timed out."; string msg = $"Connection timed out.";
@@ -182,6 +182,7 @@ namespace Discord
} }
} }
catch (OperationCanceledException) { } catch (OperationCanceledException) { }
catch (ObjectDisposedException) { }
catch (Exception ex) { DisconnectInternal(ex); } catch (Exception ex) { DisconnectInternal(ex); }
} }
private async Task SendAsync() private async Task SendAsync()
@@ -210,6 +211,7 @@ namespace Discord
} }
} }
catch (OperationCanceledException) { } catch (OperationCanceledException) { }
catch (ObjectDisposedException) { }
catch (Exception ex) { DisconnectInternal(ex); } catch (Exception ex) { DisconnectInternal(ex); }
} }