From c678432b1a65f6ce891935090d713042a3d9ee09 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sat, 30 Jul 2016 04:52:15 -0300
Subject: [PATCH] Moved reconnect's Disconnect call to its separate task

---
 src/Discord.Net/Rpc/DiscordRpcClient.cs       | 22 ++++++++++++++-----
 .../WebSocket/DiscordSocketClient.cs          | 18 +++++++--------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/Discord.Net/Rpc/DiscordRpcClient.cs b/src/Discord.Net/Rpc/DiscordRpcClient.cs
index 2c801edd6..a716b12ea 100644
--- a/src/Discord.Net/Rpc/DiscordRpcClient.cs
+++ b/src/Discord.Net/Rpc/DiscordRpcClient.cs
@@ -122,6 +122,16 @@ namespace Discord.Rpc
             }
             finally { _connectionLock.Release(); }
         }
+        private async Task DisconnectAsync(Exception ex, bool isReconnecting)
+        {
+            if (_connectTask?.TrySetException(ex) ?? false) return;
+            await _connectionLock.WaitAsync().ConfigureAwait(false);
+            try
+            {
+                await DisconnectInternalAsync(ex, isReconnecting).ConfigureAwait(false);
+            }
+            finally { _connectionLock.Release(); }
+        }
         private async Task DisconnectInternalAsync(Exception ex, bool isReconnecting)
         {
             if (!isReconnecting)
@@ -152,19 +162,19 @@ namespace Discord.Rpc
 
         private async Task StartReconnectAsync(Exception ex)
         {
-            _connectTask?.TrySetException(ex);
             await _connectionLock.WaitAsync().ConfigureAwait(false);
             try
             {
                 if (!_canReconnect || _reconnectTask != null) return;
-                await DisconnectInternalAsync(null, true).ConfigureAwait(false);
                 _reconnectCancelToken = new CancellationTokenSource();
-                _reconnectTask = ReconnectInternalAsync(_reconnectCancelToken.Token);
+                _reconnectTask = ReconnectInternalAsync(ex, _reconnectCancelToken.Token);
             }
             finally { _connectionLock.Release(); }
         }
-        private async Task ReconnectInternalAsync(CancellationToken cancelToken)
+        private async Task ReconnectInternalAsync(Exception ex, CancellationToken cancelToken)
         {
+            await DisconnectAsync(null, true).ConfigureAwait(false);
+
             try
             {
                 Random jitter = new Random();
@@ -184,9 +194,9 @@ namespace Discord.Rpc
                         _reconnectTask = null;
                         return;
                     }
-                    catch (Exception ex)
+                    catch (Exception ex2)
                     {
-                        await _rpcLogger.WarningAsync("Reconnect failed", ex).ConfigureAwait(false);
+                        await _rpcLogger.WarningAsync("Reconnect failed", ex2).ConfigureAwait(false);
                     }
                     finally { _connectionLock.Release(); }
                 }
diff --git a/src/Discord.Net/WebSocket/DiscordSocketClient.cs b/src/Discord.Net/WebSocket/DiscordSocketClient.cs
index c6f92451e..292a909fc 100644
--- a/src/Discord.Net/WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net/WebSocket/DiscordSocketClient.cs
@@ -191,13 +191,13 @@ namespace Discord.WebSocket
             }
             finally { _connectionLock.Release(); }
         }
-        private async Task DisconnectAsync(Exception ex)
+        private async Task DisconnectAsync(Exception ex, bool isReconnecting)
         {
             if (_connectTask?.TrySetException(ex) ?? false) return;
             await _connectionLock.WaitAsync().ConfigureAwait(false);
             try
             {
-                await DisconnectInternalAsync(ex, false).ConfigureAwait(false);
+                await DisconnectInternalAsync(ex, isReconnecting).ConfigureAwait(false);
             }
             finally { _connectionLock.Release(); }
         }
@@ -259,19 +259,19 @@ namespace Discord.WebSocket
 
         private async Task StartReconnectAsync(Exception ex)
         {
-            _connectTask?.TrySetException(ex);
             await _connectionLock.WaitAsync().ConfigureAwait(false);
             try
             {
                 if (!_canReconnect || _reconnectTask != null) return;
-                await DisconnectInternalAsync(null, true).ConfigureAwait(false);
                 _reconnectCancelToken = new CancellationTokenSource();
-                _reconnectTask = ReconnectInternalAsync(_reconnectCancelToken.Token);
+                _reconnectTask = ReconnectInternalAsync(ex, _reconnectCancelToken.Token);
             }
             finally { _connectionLock.Release(); }
         }
-        private async Task ReconnectInternalAsync(CancellationToken cancelToken)
+        private async Task ReconnectInternalAsync(Exception ex, CancellationToken cancelToken)
         {
+            await DisconnectAsync(null, true).ConfigureAwait(false);
+
             try
             {
                 Random jitter = new Random();
@@ -291,9 +291,9 @@ namespace Discord.WebSocket
                         _reconnectTask = null;
                         return;
                     }
-                    catch (Exception ex)
+                    catch (Exception ex2)
                     {
-                        await _gatewayLogger.WarningAsync("Reconnect failed", ex).ConfigureAwait(false);
+                        await _gatewayLogger.WarningAsync("Reconnect failed", ex2).ConfigureAwait(false);
                     }
                     finally {  _connectionLock.Release(); }
                 }
@@ -580,7 +580,7 @@ namespace Discord.WebSocket
                                     }
                                     catch (Exception ex)
                                     {
-                                        await DisconnectAsync(new Exception("Processing READY failed", ex));
+                                        await DisconnectAsync(new Exception("Processing READY failed", ex), false);
                                         return;
                                     }