From 4e4d0c5be9ae65c1a6919a60c913d739dac1e7f7 Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 25 Aug 2016 17:07:36 +0900 Subject: [PATCH] [Modify] Replace it --- websocket-sharp/WebSocket.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 914561dc..18ad6efc 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -2315,10 +2315,15 @@ namespace WebSocketSharp /// public void Close (CloseStatusCode code) { - var msg = _readyState.CheckIfAvailable (true, true, false, false) ?? - CheckCloseParameters (code, null, _client); + string msg; + if (!checkIfAvailable (true, true, false, false, out msg)) { + _logger.Error (msg); + error ("An error has occurred in closing the connection.", null); - if (msg != null) { + return; + } + + if (!CheckParametersForClose (code, null, _client, out msg)) { _logger.Error (msg); error ("An error has occurred in closing the connection.", null);