From f0933c75a01667f211fefc6ba30fc6fafba4d850 Mon Sep 17 00:00:00 2001 From: Brandon Smith Date: Fri, 4 Sep 2015 19:33:44 -0300 Subject: [PATCH] Revert "Do not allow ObjectDisposed exceptions to trigger disconnectreason" This reverts commit f6dacb7a846b575785258d8ce797e604e0498307. --- src/Discord.Net/DiscordWebSocket.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net/DiscordWebSocket.cs b/src/Discord.Net/DiscordWebSocket.cs index 3ef623d15..3a8f28a29 100644 --- a/src/Discord.Net/DiscordWebSocket.cs +++ b/src/Discord.Net/DiscordWebSocket.cs @@ -146,11 +146,11 @@ namespace Discord if (_webSocket.State != WebSocketState.Open || cancelToken.IsCancellationRequested) return; - try + try { result = await _webSocket.ReceiveAsync(new ArraySegment(buffer), cancelToken); } - catch (Win32Exception ex) + catch (Win32Exception ex) when (ex.HResult == HR_TIMEOUT) { string msg = $"Connection timed out."; @@ -182,7 +182,6 @@ namespace Discord } } catch (OperationCanceledException) { } - catch (ObjectDisposedException) { } catch (Exception ex) { DisconnectInternal(ex); } } private async Task SendAsync() @@ -211,7 +210,6 @@ namespace Discord } } catch (OperationCanceledException) { } - catch (ObjectDisposedException) { } catch (Exception ex) { DisconnectInternal(ex); } }