From 722ba1cc910e8f84bbac8c8bb31399f6a0abfdcd Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 22 Oct 2015 23:26:08 -0300
Subject: [PATCH] Fixed some race conditions

---
 src/Discord.Net/DiscordClient.cs | 35 +++++++++++++++++---------------
 src/Discord.Net/Models/Member.cs |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index fed585bd0..9c3d71e7e 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -592,26 +592,29 @@ namespace Discord
 						{
 							var data = e.Payload.ToObject<TypingStartEvent>(_serializer);
 							var channel = _channels[data.ChannelId];
-							var user = _members[data.UserId, channel.ServerId];
-
-							if (user != null)
-							{
-								if (channel != null)
-									RaiseUserIsTyping(user, channel);
-							}
-							if (Config.TrackActivity)
+							if (channel != null)
 							{
-								/*if (channel.IsPrivate)
+								var user = _members[data.UserId, channel.ServerId];
+
+								if (user != null)
 								{
-									if (user != null)
-										user.UpdateActivity();
+									if (channel != null)
+										RaiseUserIsTyping(user, channel);
 								}
-								else*/
-								if (!channel.IsPrivate)
+								if (Config.TrackActivity)
 								{
-									var member = _members[data.UserId, channel.ServerId];
-									if (member != null)
-										member.UpdateActivity();
+									/*if (channel.IsPrivate)
+									{
+										if (user != null)
+											user.UpdateActivity();
+									}
+									else*/
+									if (!channel.IsPrivate)
+									{
+										var member = _members[data.UserId, channel.ServerId];
+										if (member != null)
+											member.UpdateActivity();
+									}
 								}
 							}
 						}
diff --git a/src/Discord.Net/Models/Member.cs b/src/Discord.Net/Models/Member.cs
index 8cd7cb182..24dc267ed 100644
--- a/src/Discord.Net/Models/Member.cs
+++ b/src/Discord.Net/Models/Member.cs
@@ -186,7 +186,7 @@ namespace Discord
 		{
 			//Set roles, with the everyone role added too
 			string[] newRoles = new string[roleIds.Length + 1];
-			newRoles[0] = Server.EveryoneRoleId;
+			newRoles[0] = ServerId; //Everyone
 			for (int i = 0; i < roleIds.Length; i++)
 				newRoles[i + 1] = roleIds[i];
 			RoleIds = newRoles;