From 559b89933f6f688cecb7208f0cc8bbd112c04fe6 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 7 Jun 2016 21:19:26 -0300
Subject: [PATCH] Fixed error when passing no config to DiscordSocketClient

---
 src/Discord.Net/DiscordClient.cs       | 13 +++++++------
 src/Discord.Net/DiscordSocketClient.cs |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index 0b0d04390..4738ca174 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -3,6 +3,8 @@ using Discord.Extensions;
 using Discord.Logging;
 using Discord.Net;
 using Discord.Net.Queue;
+using Discord.Net.Rest;
+using Discord.Net.WebSockets;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -28,11 +30,10 @@ namespace Discord
         public LoginState LoginState { get; private set; }
         public API.DiscordApiClient ApiClient { get; private set; }
 
-        public DiscordClient(DiscordConfig config = null)
+        public DiscordClient()
+            : this(new DiscordConfig()) { }
+        public DiscordClient(DiscordConfig config)
         {
-            if (config == null)
-                config = new DiscordConfig();
-
             _log = new LogManager(config.LogLevel);
             _log.Message += async msg => await Log.Raise(msg).ConfigureAwait(false);
             _discordLogger = _log.CreateLogger("Discord");
@@ -41,10 +42,10 @@ namespace Discord
             _connectionLock = new SemaphoreSlim(1, 1);
             _requestQueue = new RequestQueue();
 
-            ApiClient = new API.DiscordApiClient(config.RestClientProvider, requestQueue: _requestQueue);
+            ApiClient = new API.DiscordApiClient(config.RestClientProvider, (config as DiscordSocketConfig)?.WebSocketProvider, requestQueue: _requestQueue);
             ApiClient.SentRequest += async (method, endpoint, millis) => await _log.Verbose("Rest", $"{method} {endpoint}: {millis} ms").ConfigureAwait(false);
         }
-        
+
         public async Task Login(TokenType tokenType, string token, bool validateToken = true)
         {
             await _connectionLock.WaitAsync().ConfigureAwait(false);
diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs
index af4551872..23a91e915 100644
--- a/src/Discord.Net/DiscordSocketClient.cs
+++ b/src/Discord.Net/DiscordSocketClient.cs
@@ -73,11 +73,11 @@ namespace Discord
         }
         internal IReadOnlyCollection<VoiceRegion> VoiceRegions => _voiceRegions.ToReadOnlyCollection();
 
-        public DiscordSocketClient(DiscordSocketConfig config = null)
+        public DiscordSocketClient()
+            : this(new DiscordSocketConfig()) { }
+        public DiscordSocketClient(DiscordSocketConfig config)
+            : base(config)
         {
-            if (config == null)
-                config = new DiscordSocketConfig();
-
             ShardId = config.ShardId;
             _totalShards = config.TotalShards;