Reinforcing the client's disconnect method

I've seen some socket aborted exceptions thrown on disconnect. We should be handling these errors.

Author: blackspherefollower

Buttplug.Client/ButtplugWSClient.cs

@@ -69,12 +69,6 @@ public class ButtplugWSClient
         [CanBeNull]
         public event EventHandler<LogEventArgs> Log;
 
-        [CanBeNull]
-        private bool _gotServerInfo;
-
-        [CanBeNull]
-        private bool _gotError;
-
         public uint nextMsgId
         {
             get
@@ -110,8 +104,6 @@ public async Task Connect(Uri aURL)
             _waitingMsgs.Clear();
             _devices.Clear();
             _counter = 1;
-            _gotServerInfo = false;
-            _gotError = false;
             await _ws.ConnectAsync(aURL, CancellationToken.None);
 
             if (_ws.State != WebSocketState.Open)
@@ -149,16 +141,34 @@ public async Task Disconnect()
                 _pingTimer = null;
             }
 
-            while (_ws != null && _ws.State != WebSocketState.Closed && _ws.State != WebSocketState.Aborted)
+            try
             {
-                if (_ws.State != WebSocketState.CloseSent && _ws.State != WebSocketState.Closed)
+                while (_ws != null && _ws.State != WebSocketState.Closed && _ws.State != WebSocketState.Aborted)
                 {
-                    await _ws.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "Client shutdown", _tokenSource.Token);
+                    if (_ws.State != WebSocketState.CloseSent && _ws.State != WebSocketState.Closed)
+                    {
+                        await _ws.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "Client shutdown", _tokenSource.Token);
+                    }
                 }
             }
+            catch
+            {
+                // noop - something when wrong closing the socket, but we're
+                // about to dispose of it anyway.
+            }
+
+            try
+            {
+                _tokenSource.Cancel();
+                _readThread.Wait();
+            }
+            catch
+            {
+                // noop - something when wrong closing the socket, but we're
+                // about to dispose of it anyway.
+            }
 
-            _tokenSource.Cancel();
-            _readThread.Wait();
+            _ws = null;
 
             var max = 3;
             while (max-- > 0 && _waitingMsgs.Count != 0)