Fix possible null reference if proxy is never started

jo3bingham · jo3bingham · commit 5a20222b692f · 2018-10-06T13:48:35.000+01:00
diff --git a/TibiaAPI/Network/Connection.cs b/TibiaAPI/Network/Connection.cs
@@ -301,9 +301,21 @@ internal void Stop()
                 _zStream.deflateEnd();
                 _zStream.inflateEnd();
                 _httpListener.Close();
-                _tcpListener.Stop();
-                _clientSocket.Close();
-                _serverSocket.Close();
+
+                if (_tcpListener != null)
+                {
+                    _tcpListener.Stop();
+                }
+
+                if (_clientSocket != null)
+                {
+                    _clientSocket.Close();
+                }
+
+                if (_serverSocket != null)
+                {
+                    _serverSocket.Close();
+                }
             }
             catch (Exception ex)
             {
@@ -865,8 +877,16 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _httpClient.Dispose();
-                    _clientSocket.Dispose();
-                    _serverSocket.Dispose();
+
+                    if (_clientSocket != null)
+                    {
+                        _clientSocket.Dispose();
+                    }
+
+                    if (_serverSocket != null)
+                    {
+                        _serverSocket.Dispose();
+                    }
                 }
 
                 disposedValue = true;
