update live tv styles

2 files changed, 7 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
index e64121c45..f1d4c3555 100644
--- a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
@@ -79,9 +79,12 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private void ResetPingTimer()
         {
-            var period = TimeSpan.FromSeconds(60);
+            if (_pingTimer != null)
+            {
+                var period = TimeSpan.FromSeconds(60);
 
-            _pingTimer.Change(period, period);
+                _pingTimer.Change(period, period);
+            }
         }
 
         private Task SendMessage(string name, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 0ee9e6213..ee09395da 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -165,6 +165,8 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (disposable != null)
             {
+                _logger.Debug("Disposing session controller {0}", disposable.GetType().Name);
+
                 try
                 {
                     disposable.Dispose();