Merge branch 'master' of https://github.com/MediaBrowser/Emby

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index e6b6bc2e3..ced85780f 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -390,13 +390,13 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
 
             try
             {
-                var localTask = ScheduledTask.Execute(CurrentCancellationTokenSource.Token, progress);
-
                 if (options != null && options.MaxRuntimeMs.HasValue)
                 {
                     CurrentCancellationTokenSource.CancelAfter(options.MaxRuntimeMs.Value);
                 }
 
+                var localTask = ScheduledTask.Execute(CurrentCancellationTokenSource.Token, progress);
+
                 await localTask.ConfigureAwait(false);
 
                 status = TaskCompletionStatus.Completed;