From 24d91d9363ec909688c571f133db4ebf0fde7f86 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 7 Jul 2017 18:04:46 -0400
Subject: update image inheritance

---
 Emby.Server.Implementations/Dto/DtoService.cs           |  2 +-
 .../ScheduledTasks/SystemUpdateTask.cs                  | 17 +++--------------
 .../Updates/InstallationManager.cs                      |  2 --
 3 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 9767de9e0..2933a9f22 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1539,7 +1539,7 @@ namespace Emby.Server.Implementations.Dto
                         dto.ParentArtImageTag = GetImageCacheTag(parent, image);
                     }
                 }
-                if (thumbLimit > 0 && !dto.HasThumb && (dto.ParentThumbItemId == null || parent is Series))
+                if (thumbLimit > 0 && !dto.HasThumb && (dto.ParentThumbItemId == null || parent is Series) && !(parent is ICollectionFolder) && !(parent is UserView))
                 {
                     var image = allImages.FirstOrDefault(i => i.Type == ImageType.Thumb);
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs
index a41e21a4b..52bd0a504 100644
--- a/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs
@@ -68,23 +68,14 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// <returns>Task.</returns>
         public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
-            EventHandler<double> innerProgressHandler = (sender, e) => progress.Report(e * .1);
-
             // Create a progress object for the update check
-            var innerProgress = new SimpleProgress<double>();
-            innerProgress.ProgressChanged += innerProgressHandler;
-
-            var updateInfo = await _appHost.CheckForApplicationUpdate(cancellationToken, innerProgress).ConfigureAwait(false);
-
-            // Release the event handler
-            innerProgress.ProgressChanged -= innerProgressHandler;
+            var updateInfo = await _appHost.CheckForApplicationUpdate(cancellationToken, new SimpleProgress<double>()).ConfigureAwait(false);
 
             progress.Report(10);
 
             if (!updateInfo.IsUpdateAvailable)
             {
                 Logger.Debug("No application update available.");
-                progress.Report(100);
                 return;
             }
 
@@ -96,9 +87,9 @@ namespace Emby.Server.Implementations.ScheduledTasks
             {
                 Logger.Info("Update Revision {0} available.  Updating...", updateInfo.AvailableVersion);
 
-                innerProgressHandler = (sender, e) => progress.Report(e * .9 + .1);
+                EventHandler<double> innerProgressHandler = (sender, e) => progress.Report(e * .9 + .1);
 
-                innerProgress = new SimpleProgress<double>();
+                var innerProgress = new SimpleProgress<double>();
                 innerProgress.ProgressChanged += innerProgressHandler;
 
                 await _appHost.UpdateApplication(updateInfo.Package, cancellationToken, innerProgress).ConfigureAwait(false);
@@ -110,8 +101,6 @@ namespace Emby.Server.Implementations.ScheduledTasks
             {
                 Logger.Info("A new version of " + _appHost.Name + " is available.");
             }
-
-            progress.Report(100);
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 717416da1..6e37c1dc1 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -513,8 +513,6 @@ namespace Emby.Server.Implementations.Updates
                     CurrentInstallations.Remove(tuple);
                 }
 
-                progress.Report(100);
-
                 CompletedInstallationsInternal.Add(installationInfo);
 
                 EventHelper.FireEventIfNotNull(PackageInstallationCompleted, this, installationEventArgs, _logger);
-- 
cgit v1.2.3