2 files changed, 12 insertions, 20 deletions

diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index d2da2ee84..e8ad9ea95 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -1,12 +1,11 @@
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Tasks;
-using ServiceStack;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.ScheduledTasks
 {
@@ -198,17 +197,13 @@ namespace MediaBrowser.Api.ScheduledTasks
                 throw new ResourceNotFoundException("Task not found");
             }
 
-            var hasKey = task.ScheduledTask as IHasKey;
-            if (hasKey != null)
+            if (string.Equals(task.ScheduledTask.Key, "SystemUpdateTask", StringComparison.OrdinalIgnoreCase))
             {
-                if (string.Equals(hasKey.Key, "SystemUpdateTask", StringComparison.OrdinalIgnoreCase))
+                // This is a hack for now just to get the update application function to work when auto-update is disabled
+                if (!_config.Configuration.EnableAutoUpdate)
                 {
-                    // This is a hack for now just to get the update application function to work when auto-update is disabled
-                    if (!_config.Configuration.EnableAutoUpdate)
-                    {
-                        _config.Configuration.EnableAutoUpdate = true;
-                        _config.SaveConfiguration();
-                    }
+                    _config.Configuration.EnableAutoUpdate = true;
+                    _config.SaveConfiguration();
                 }
             }
 
@@ -252,7 +247,7 @@ namespace MediaBrowser.Api.ScheduledTasks
 
             var triggerInfos = request;
 
-            task.Triggers = triggerInfos.Select(ScheduledTaskHelpers.GetTrigger);
+            task.Triggers = triggerInfos.ToArray();
         }
     }
 }
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index 5d3465c58..ee74ec450 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -1,11 +1,10 @@
-using MediaBrowser.Common.ScheduledTasks;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Tasks;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Threading;
 
 namespace MediaBrowser.Api.ScheduledTasks
 {
@@ -32,10 +31,8 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// <summary>
         /// Initializes a new instance of the <see cref="ScheduledTasksWebSocketListener" /> class.
         /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="taskManager">The task manager.</param>
-        public ScheduledTasksWebSocketListener(ILogger logger, ITaskManager taskManager)
-            : base(logger)
+        public ScheduledTasksWebSocketListener(ILogger logger, ITaskManager taskManager, ITimerFactory timerFactory)
+            : base(logger, timerFactory)
         {
             TaskManager = taskManager;
 
@@ -85,7 +82,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         {
             TaskManager.TaskExecuting -= TaskManager_TaskExecuting;
             TaskManager.TaskCompleted -= TaskManager_TaskCompleted;
-            
+
             base.Dispose(dispose);
         }
     }