From 4919c8f5914434dff866f97a2a26f1293eaf6db1 Mon Sep 17 00:00:00 2001
From: Auxe <jascrod@yahoo.com>
Date: Mon, 5 Sep 2016 19:32:58 -0500
Subject: [PATCH] Made the requested changes

---
 src/Discord.Net/WebSocket/DiscordSocketClient.cs         | 2 +-
 src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Discord.Net/WebSocket/DiscordSocketClient.cs b/src/Discord.Net/WebSocket/DiscordSocketClient.cs
index f7344c012..5d5d87ebd 100644
--- a/src/Discord.Net/WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net/WebSocket/DiscordSocketClient.cs
@@ -793,7 +793,7 @@ namespace Discord.WebSocket
                                         if (guild != null)
                                         {
                                             guild.AddChannel(data, DataStore);
-                                            channel = DataStore.GetChannel(data.Id);
+                                            channel = guild.AddChannel(data, DataStore);
 
                                             if (!guild.IsSynced)
                                             {
diff --git a/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs
index ea0eb07a9..75f8fded2 100644
--- a/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs
@@ -148,11 +148,12 @@ namespace Discord.WebSocket
 
         public override Task<IGuildChannel> GetChannelAsync(ulong id) => Task.FromResult<IGuildChannel>(GetChannel(id));
         public override Task<IReadOnlyCollection<IGuildChannel>> GetChannelsAsync() => Task.FromResult<IReadOnlyCollection<IGuildChannel>>(Channels);
-        public void AddChannel(ChannelModel model, DataStore dataStore, ConcurrentHashSet<ulong> channels = null)
+        public ISocketGuildChannel AddChannel(ChannelModel model, DataStore dataStore, ConcurrentHashSet<ulong> channels = null)
         {
             var channel = ToChannel(model);
             (channels ?? _channels).TryAdd(model.Id);
             dataStore.AddChannel(channel);
+            return channel;
         }
         public ISocketGuildChannel GetChannel(ulong id)
         {