github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #320

Browse Source 
I'm not entirely sure this is the proper way to fix this. However, it seems like
SendFileAsync returns the Task<RestUserMessage>, which would exit the using
block, disposing of the FileStream potentially before the Task is finished.

Changed to await the result of the task before exiting the using block.
This commit is contained in:
james7132
2016-10-18 17:41:32 +00:00
parent dfe654af3b
commit 7dbd2b5325
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
View File

@@ -117,12 +117,12 @@ namespace Discord.Rest
return RestUserMessage.Create(client, guild, model); return RestUserMessage.Create(client, guild, model);
} }
public static Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client, public static async Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client,
string filePath, string text, bool isTTS, IGuild guild, RequestOptions options) string filePath, string text, bool isTTS, IGuild guild, RequestOptions options)
{ {
string filename = Path.GetFileName(filePath); string filename = Path.GetFileName(filePath);
using (var file = File.OpenRead(filePath)) using (var file = File.OpenRead(filePath))
return SendFileAsync(channel, client, file, filename, text, isTTS, guild, options); return await SendFileAsync(channel, client, file, filename, text, isTTS, guild, options).ConfigureAwait(false);
} }
public static async Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client, public static async Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client,
Stream stream, string filename, string text, bool isTTS, IGuild guild, RequestOptions options) Stream stream, string filename, string text, bool isTTS, IGuild guild, RequestOptions options)