Merge branch 'dev' of https://github.com/hatharry/Emby.git

1 files changed, 3 insertions, 7 deletions

diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index ab2aa761b..ced85780f 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -334,7 +334,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
 
             trigger.Stop();
 
-            TaskManager.QueueScheduledTask(ScheduledTask);
+            TaskManager.QueueScheduledTask(ScheduledTask, e.Argument);
 
             await Task.Delay(1000).ConfigureAwait(false);
 
@@ -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;
@@ -423,10 +423,6 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
             CurrentProgress = null;
 
             OnTaskCompleted(startTime, endTime, status, failureException);
-
-            // Bad practice, i know. But we keep a lot in memory, unfortunately.
-            GC.Collect(2, GCCollectionMode.Forced, true);
-            GC.Collect(2, GCCollectionMode.Forced, true);
         }
 
         /// <summary>