add socket error message

3 files changed, 4 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
index 8ab8b0215..a8b3bc10b 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -56,7 +56,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         void socket_OnError(object sender, SocketHttpListener.ErrorEventArgs e)
         {
-            EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
+            _logger.Error("Error in SharpWebSocket: {0}", e.Message ?? string.Empty);
+            //EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
         }
 
         void socket_OnClose(object sender, SocketHttpListener.CloseEventArgs e)
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index d4ecd9572..1e1949533 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             get
             {
-                return _isActive;
+                return HasOpenSockets;
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs b/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs
index 2f2d9860c..00be0f18e 100644
--- a/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
 
         public Stream BuildThumbCollage(IEnumerable<string> paths, string text, int width, int height)
         {
-            using (var wand = BuildThumbCollageWandWithText(paths, text, width, height))
+            using (var wand = BuildThumbCollageWand(paths, width, height))
             {
                 return DynamicImageHelpers.GetStream(wand, _appPaths);
             }