diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-16 08:23:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-16 08:23:02 -0400 |
| commit | a44bebb3928b1b5142f4fd48242d9179fac8e4dc (patch) | |
| tree | 2ffba4f4b1888d1952519d7ee3b02111ed3012ed /MediaBrowser.Common.Implementations | |
| parent | dcc5440ba0e0c14a90f669f1abb7d80f4c69b05d (diff) | |
| parent | c52de51c3c2730f9e3842774bf0c37b799fea697 (diff) | |
Merge pull request #2175 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Common.Implementations')
| -rw-r--r-- | MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs index 798e18ef5..446e399bd 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; |