From 14720063bc3344791fe2b8028bc50fc83dacbdb5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Dec 2013 13:46:38 -0500
Subject: fix web socket attachment to session object

---
 .../Session/SessionWebSocketListener.cs                           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
index cc82156e8..08481f09f 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -114,7 +114,13 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (session != null)
             {
-                var controller = new WebSocketController(session, _appHost);
+                var controller = session.SessionController as WebSocketController;
+
+                if (controller == null)
+                {
+                    controller = new WebSocketController(session, _appHost);
+                }
+
                 controller.Sockets.Add(message.Connection);
 
                 session.SessionController = controller;
-- 
cgit v1.2.3