From 934bfebc9b892eb3e5504f29e1eb83576d625147 Mon Sep 17 00:00:00 2001 From: RogueException Date: Wed, 6 Jan 2016 04:16:54 -0400 Subject: [PATCH] Added a proper async context to Run(), renamed parameter-less Run to Wait --- src/Discord.Net/DiscordClient.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index e39a739f1..6b826be50 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -1052,13 +1052,13 @@ namespace Discord { try { - asyncAction().GetAwaiter().GetResult(); //Avoids creating AggregateExceptions + AsyncContext.Run(asyncAction); } catch (TaskCanceledException) { } _disconnectedEvent.WaitOne(); } /// Blocking call that will not return until client has been stopped. This is mainly intended for use in console applications. - public void Run() + public void Wait() { _disconnectedEvent.WaitOne(); }