From b048230518480c3169b5d411514f1b4b494b1dec Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 29 Sep 2013 11:33:04 -0400 Subject: [PATCH] don't stop alchemy server if it hasn't already started --- .../WebSocket/AlchemyServer.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs b/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs index fc445ec9d9..56296ba849 100644 --- a/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs +++ b/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs @@ -49,6 +49,8 @@ namespace MediaBrowser.Server.Implementations.WebSocket /// The port. public int Port { get; private set; } + private bool _hasStarted; + /// /// Starts the specified port number. /// @@ -60,10 +62,12 @@ namespace MediaBrowser.Server.Implementations.WebSocket WebSocketServer = new WebSocketServer(portNumber, IPAddress.Any) { OnConnected = OnAlchemyWebSocketClientConnected, - TimeOut = TimeSpan.FromHours(12) + TimeOut = TimeSpan.FromHours(24) }; WebSocketServer.Start(); + + _hasStarted = true; } catch (SocketException ex) { @@ -123,7 +127,11 @@ namespace MediaBrowser.Server.Implementations.WebSocket { if (WebSocketServer != null) { - WebSocketServer.Stop(); + if (_hasStarted) + { + WebSocketServer.Stop(); + } + WebSocketServer.Dispose(); WebSocketServer = null; }