From e710c586b7472215b82896894c60846c39340853 Mon Sep 17 00:00:00 2001 From: quin lynch Date: Tue, 11 Jan 2022 02:48:20 -0400 Subject: [PATCH] Add catch for operation canceled --- src/Discord.Net.WebSocket/ConnectionManager.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Discord.Net.WebSocket/ConnectionManager.cs b/src/Discord.Net.WebSocket/ConnectionManager.cs index f304d4ea8..ec5eb93eb 100644 --- a/src/Discord.Net.WebSocket/ConnectionManager.cs +++ b/src/Discord.Net.WebSocket/ConnectionManager.cs @@ -78,6 +78,14 @@ namespace Discord nextReconnectDelay = 1000; //Reset delay await _connectionPromise.Task.ConfigureAwait(false); } + catch (OperationCanceledException ex) + { + // Added back for log out / stop to client. The connection promise would cancel and it would be logged as an error, shouldn't be the case. + // ref #2026 + + Cancel(); //In case this exception didn't come from another Error call + await DisconnectAsync(ex, !reconnectCancelToken.IsCancellationRequested).ConfigureAwait(false); + } catch (Exception ex) { Error(ex); //In case this exception didn't come from another Error call