Added catch statement to close socket

nicholas-maltbie · nicholas-maltbie · commit c889a3c68c55 · 2022-11-24T01:52:06.000-08:00
diff --git a/Transports/com.community.netcode.transport.websocket/Runtime/NativeWebSocketClient.cs b/Transports/com.community.netcode.transport.websocket/Runtime/NativeWebSocketClient.cs
@@ -63,6 +63,11 @@ public void Connect()
 
         public void Close(CloseStatusCode code = CloseStatusCode.Normal, string reason = null)
         {
+            if (Connection == null)
+            {
+                return;
+            }
+
             if (ReadyState == WebSocketSharp.WebSocketState.Closing)
             {
                 throw new InvalidOperationException("Socket is already closing");
diff --git a/Transports/com.community.netcode.transport.websocket/Runtime/WebSocketTransport.cs b/Transports/com.community.netcode.transport.websocket/Runtime/WebSocketTransport.cs
@@ -97,7 +97,6 @@ public override void Shutdown()
             if (WebSocketClient != null)
             {
                 WebSocketClient.Close();
-                WebSocketClient = null;
             }
             else if (WebSocketServer != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@ public void Connect()`
`63`	`63`
`64`	`64`	`public void Close(CloseStatusCode code = CloseStatusCode.Normal, string reason = null)`
`65`	`65`	`{`
	`66`	`+ if (Connection == null)`
	`67`	`+ {`
	`68`	`+ return;`
	`69`	`+ }`
	`70`	`+`
`66`	`71`	`if (ReadyState == WebSocketSharp.WebSocketState.Closing)`
`67`	`72`	`{`
`68`	`73`	`throw new InvalidOperationException("Socket is already closing");`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ public override void Shutdown()`
`97`	`97`	`if (WebSocketClient != null)`
`98`	`98`	`{`
`99`	`99`	`WebSocketClient.Close();`
`100`		`- WebSocketClient = null;`
`101`	`100`	`}`
`102`	`101`	`else if (WebSocketServer != null)`
`103`	`102`	`{`