aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
diff options
context:
space:
mode:
authorTim Hobbs <jesus.tesh@gmail.com>2014-04-06 11:01:26 -0700
committerTim Hobbs <jesus.tesh@gmail.com>2014-04-06 11:01:26 -0700
commit631bba1d3cbcd2e8dc9c84c23d89b910dc8e0113 (patch)
tree3ff1455a7dbf551e5752b3c88f9adb3bc9554644 /MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
parent0f88830fd98173815da097c54e5d8d5281dbffd5 (diff)
parentc60103df64104459883f1244363cc9cd39187545 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs')
-rw-r--r--MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 2b7a1a21e..b800a9cbe 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -157,11 +157,10 @@ namespace MediaBrowser.Server.Implementations.ServerManager
var info = new WebSocketMessageInfo
{
MessageType = stub.MessageType,
- Data = stub.Data == null ? null : stub.Data.ToString()
+ Data = stub.Data == null ? null : stub.Data.ToString(),
+ Connection = this
};
- info.Connection = this;
-
OnReceive(info);
}
catch (Exception ex)