From 82ee6c5aaa8363c6682d697be139b3fce3dd2a0a Mon Sep 17 00:00:00 2001 From: RogueException Date: Wed, 12 Oct 2016 15:32:22 -0300 Subject: [PATCH] Fixed error when calling GetMessagesAsync with no cached messages --- .../Entities/Channels/SocketChannelHelper.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs index f91ab4c2d..e2ea4c87e 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs @@ -34,9 +34,10 @@ namespace Discord.WebSocket limit -= cachedMessages.Count; if (mode == CacheMode.CacheOnly || limit <= 0) return result; - + //Download remaining messages - var downloadedMessages = ChannelHelper.GetMessagesAsync(channel, discord, cachedMessages.Min(x => x.Id), dir, limit, guild, options); + ulong? minId = cachedMessages.Count > 0 ? cachedMessages.Min(x => x.Id) : (ulong?)null; + var downloadedMessages = ChannelHelper.GetMessagesAsync(channel, discord, minId, dir, limit, guild, options); return result.Concat(downloadedMessages); } else