Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

1 files changed, 12 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index 8dfdfdaec..f993e1fc3 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.FileOrganization
 {
-    public class OrganizerScheduledTask : IScheduledTask, IConfigurableScheduledTask, IScheduledTaskActivityLog
+    public class OrganizerScheduledTask : IScheduledTask, IConfigurableScheduledTask, IScheduledTaskActivityLog, IHasKey
     {
         private readonly ILibraryMonitor _libraryMonitor;
         private readonly ILibraryManager _libraryManager;
@@ -54,10 +54,13 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             return _config.GetAutoOrganizeOptions().TvOptions;
         }
 
-        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
-            return new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, _organizationService, _config, _providerManager)
-                .Organize(GetTvOptions(), cancellationToken, progress);
+            if (GetTvOptions().IsEnabled)
+            {
+                await new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, _organizationService, _config, _providerManager)
+                    .Organize(GetTvOptions(), cancellationToken, progress).ConfigureAwait(false);
+            }
         }
 
         public IEnumerable<ITaskTrigger> GetDefaultTriggers()
@@ -82,5 +85,10 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
         {
             get { return false; }
         }
+
+        public string Key
+        {
+            get { return "AutoOrganize"; }
+        }
     }
 }