From f76d4685827e2bd07807317471cf04c21be02f52 Mon Sep 17 00:00:00 2001 From: RogueException Date: Sun, 26 Jun 2016 22:54:01 -0300 Subject: [PATCH] Dont initialize the websocket engine if DiscordClient is given a DiscordSocketConfig --- src/Discord.Net/DiscordClient.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 9b0cfbb6b..3e87dee1e 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -56,7 +56,9 @@ namespace Discord await _queueLogger.WarningAsync($"Unknown rate limit bucket \"{id ?? "null"}\"").ConfigureAwait(false); }; - ApiClient = new API.DiscordApiClient(config.RestClientProvider, (config as DiscordSocketConfig)?.WebSocketProvider, requestQueue: _requestQueue); + var restProvider = config.RestClientProvider; + var webSocketProvider = (this is DiscordSocketClient) ? (config as DiscordSocketConfig)?.WebSocketProvider : null; //TODO: Clean this check + ApiClient = new API.DiscordApiClient(restProvider, webSocketProvider, requestQueue: _requestQueue); ApiClient.SentRequest += async (method, endpoint, millis) => await _restLogger.VerboseAsync($"{method} {endpoint}: {millis} ms").ConfigureAwait(false); }