Ensure State is Connected before raising DiscordClient.Connected

2016-01-13 04:24:31 -04:00
parent c1f24d164b
commit 2f8754091e
1 changed files with 6 additions and 3 deletions
--- a/src/Discord.Net/Net/WebSockets/WebSocket.cs
+++ b/src/Discord.Net/Net/WebSockets/WebSocket.cs
@@ -99,10 +99,10 @@ namespace Discord.Net.WebSockets
 			try
            {
                State = ConnectionState.Connected;
-
-				_connectedEvent.Set();
                Logger.Info($"Connected");
+
                OnConnected();
+                _connectedEvent.Set();
 			}
 			catch (Exception ex)
            {
@@ -173,7 +173,10 @@ namespace Discord.Net.WebSockets
            try
            {
                if (!_connectedEvent.Wait(_client.Config.ConnectionTimeout, cancelToken))
-                    throw new TimeoutException();
+                {
+                    if (State != ConnectionState.Connected)
+                        throw new TimeoutException();
+                }
            }
            catch (OperationCanceledException)
            {