update live tv styles

4 files changed, 12 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
index b7af8beeb..05c972a4e 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Logging;
-using MoreLinq;
 using System;
 using System.Linq;
 using System.Threading;
@@ -77,7 +76,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 double percent = numComplete;
                 percent /= people.Count;
 
-                progress.Report(15 + 85 * percent);
+                progress.Report(100 * percent);
             }
 
             progress.Report(100);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 7bf484689..8d9abc128 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -244,6 +244,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             if (imageTag != null)
             {
                 dto.ImageTags[ImageType.Primary] = imageTag;
+                _dtoService.AttachPrimaryImageAspectRatio(dto, recording);
             }
 
             if (user != null)
@@ -331,6 +332,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             if (imageTag != null)
             {
                 dto.ImageTags[ImageType.Primary] = imageTag;
+
+                _dtoService.AttachPrimaryImageAspectRatio(dto, info);
             }
 
             if (currentProgram != null)
@@ -392,6 +395,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             if (imageTag != null)
             {
                 dto.ImageTags[ImageType.Primary] = imageTag;
+                _dtoService.AttachPrimaryImageAspectRatio(dto, item);
             }
 
             if (user != null)
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();