From e661827d0995afa9552573a5e16c04274b4396e7 Mon Sep 17 00:00:00 2001 From: sta Date: Wed, 26 Mar 2014 15:23:39 +0900 Subject: [PATCH] Fix for issue #34 --- websocket-sharp/WebSocket.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index c6a1be57..10e74efb 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -501,11 +501,13 @@ namespace WebSocketSharp private bool acceptDataFrame (WsFrame frame) { var args = frame.IsCompressed - ? new MessageEventArgs ( - frame.Opcode, frame.PayloadData.ApplicationData.Decompress (_compression)) - : new MessageEventArgs (frame.Opcode, frame.PayloadData); + ? new MessageEventArgs ( + frame.Opcode, frame.PayloadData.ApplicationData.Decompress (_compression)) + : new MessageEventArgs (frame.Opcode, frame.PayloadData); + + if (_readyState == WebSocketState.Open) + OnMessage.Emit (this, args); - OnMessage.Emit (this, args); return true; } @@ -558,7 +560,9 @@ namespace WebSocketSharp data = concatenated.ToArray (); } - OnMessage.Emit (this, new MessageEventArgs (first.Opcode, data)); + if (_readyState == WebSocketState.Open) + OnMessage.Emit (this, new MessageEventArgs (first.Opcode, data)); + return true; } }