From a55a1f39919274bd691e694444ed92cd2891d7ae Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 15 Sep 2015 13:34:14 -0300 Subject: [PATCH] A few DNX Core adjustments --- src/Discord.Net/DiscordClient.cs | 6 +----- src/Discord.Net/DiscordClientConfig.cs | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index fd363277a..c5a2c394b 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -642,12 +642,8 @@ namespace Discord case (int)DiscordClientState.Connecting: throw new InvalidOperationException("The client is connecting."); } - -#if !DNXCORE50 + if (checkVoice && !_config.EnableVoice) -#else - if (checkVoice) //Always fail on DNXCORE50 -#endif throw new InvalidOperationException("Voice is not enabled for this client."); } private void RaiseEvent(string name, Action action) diff --git a/src/Discord.Net/DiscordClientConfig.cs b/src/Discord.Net/DiscordClientConfig.cs index 20c6b9816..0eb2babc5 100644 --- a/src/Discord.Net/DiscordClientConfig.cs +++ b/src/Discord.Net/DiscordClientConfig.cs @@ -29,9 +29,13 @@ namespace Discord private int _voiceBufferLength = 3000; //Experimental Features +#if !DNXCORE50 /// (Experimental) Enables the voice websocket and UDP client. This option requires the opus .dll or .so be in the local lib/ folder. public bool EnableVoice { get { return _enableVoice; } set { SetValue(ref _enableVoice, value); } } private bool _enableVoice = false; +#else + internal bool EnableVoice => false; +#endif /// (Experimental) Enables or disables the internal message queue. This will allow SendMessage to return immediately and handle messages internally. Messages will set the IsQueued and HasFailed properties to show their progress. public bool UseMessageQueue { get { return _useMessageQueue; } set { SetValue(ref _useMessageQueue, value); } } private bool _useMessageQueue = false;