From 7606dd650fa9fef1638ff9e3049e807dbdefd9a3 Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 3 May 2016 13:53:42 -0300 Subject: [PATCH] Use cancelTokens in LargeServerDownloader --- src/Discord.Net.Shared/TaskExtensions.cs | 10 +++++----- src/Discord.Net/DiscordClient.cs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Discord.Net.Shared/TaskExtensions.cs b/src/Discord.Net.Shared/TaskExtensions.cs index 520114f02..a6828c7fb 100644 --- a/src/Discord.Net.Shared/TaskExtensions.cs +++ b/src/Discord.Net.Shared/TaskExtensions.cs @@ -53,15 +53,15 @@ namespace Discord } } - public static async Task Wait(this CancellationTokenSource tokenSource) + public static async Task Wait(this CancellationTokenSource cancelTokenSource) { - var token = tokenSource.Token; - try { await Task.Delay(-1, token).ConfigureAwait(false); } + var cancelToken = cancelTokenSource.Token; + try { await Task.Delay(-1, cancelToken).ConfigureAwait(false); } catch (OperationCanceledException) { } //Expected } - public static async Task Wait(this CancellationToken token) + public static async Task Wait(this CancellationToken cancelToken) { - try { await Task.Delay(-1, token).ConfigureAwait(false); } + try { await Task.Delay(-1, cancelToken).ConfigureAwait(false); } catch (OperationCanceledException) { } //Expected } } diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 7b3bb422d..de2797b1e 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -1079,7 +1079,7 @@ namespace Discord ulong[] serverIds = new ulong[batchSize]; while (!cancelToken.IsCancellationRequested && State == ConnectionState.Connecting) - await Task.Delay(100).ConfigureAwait(false); + await Task.Delay(1000, cancelToken).ConfigureAwait(false); while (!cancelToken.IsCancellationRequested && State == ConnectionState.Connected) { @@ -1092,7 +1092,7 @@ namespace Discord if (count > 0) GatewaySocket.SendRequestMembers(serverIds.Take(count), "", 0); } - await Task.Delay(1250).ConfigureAwait(false); + await Task.Delay(1250, cancelToken).ConfigureAwait(false); } } catch (OperationCanceledException) { }