From 2f8754091eb8918a368fe406ce7afa161586640e Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Wed, 13 Jan 2016 04:24:31 -0400
Subject: [PATCH] Ensure State is Connected before raising
 DiscordClient.Connected

---
 src/Discord.Net/Net/WebSockets/WebSocket.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Discord.Net/Net/WebSockets/WebSocket.cs b/src/Discord.Net/Net/WebSockets/WebSocket.cs
index 935d9a2c1..6cf103f72 100644
--- 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)
             {