Skip to content

Commit 95f09d1

Browse files
Changed close on already closed to end quietly
1 parent 18f9673 commit 95f09d1

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Transports/com.community.netcode.transport.websocket/Runtime/NativeWebSocketClient.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,14 @@ public void Connect()
6363

6464
public void Close(CloseStatusCode code = CloseStatusCode.Normal, string reason = null)
6565
{
66-
if (Connection == null)
67-
{
68-
return;
69-
}
70-
7166
if (ReadyState == WebSocketSharp.WebSocketState.Closing)
7267
{
7368
throw new InvalidOperationException("Socket is already closing");
7469
}
7570

7671
if (ReadyState == WebSocketSharp.WebSocketState.Closed)
7772
{
78-
throw new InvalidOperationException("Socket is already closed");
73+
return;
7974
}
8075

8176
try

Transports/com.community.netcode.transport.websocket/Runtime/WebSocketTransport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public override void Send(ulong clientId, ArraySegment<byte> data, NetworkDelive
9393

9494
public override void Shutdown()
9595
{
96-
IsStarted = false;
9796
if (WebSocketClient != null)
9897
{
9998
WebSocketClient.Close();
@@ -102,6 +101,7 @@ public override void Shutdown()
102101
{
103102
WebSocketServer.Stop();
104103
}
104+
IsStarted = false;
105105
}
106106

107107
public override bool StartClient()

0 commit comments

Comments
 (0)