From 9e809b06c4132514cfdbba29c2121035d4555247 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 20 Jan 2015 16:32:48 -0500
Subject: separate task buttons script

---
 .../FileOrganization/OrganizerScheduledTask.cs                   | 9 ++++++---
 .../Localization/Server/server.json                              | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index 74b994c28..f993e1fc3 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
@@ -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()
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 3c44adc60..e4677e4d1 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -47,7 +47,7 @@
     "LabelDashboardSourcePath": "Web client source path:",
     "LabelDashboardSourcePathHelp": "If running the server from source, specify the path to the dashboard-ui folder. All web client files will be served from this location.",
     "ButtonConvertMedia": "Convert media",
-    "ButtonOrganizeNow":  "Organize now",
+    "ButtonOrganize": "Organize",
     "ButtonOk": "Ok",
     "ButtonCancel": "Cancel",
     "ButtonNew": "New",
-- 
cgit v1.2.3