Merge branch 'beta'

1 files changed, 13 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index 33874b4d4..d95a4fefb 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -149,6 +149,11 @@ namespace MediaBrowser.Server.Implementations.Sync
         {
             var job = _syncRepo.GetJob(id);
 
+            if (job == null)
+            {
+                return Task.FromResult(true);
+            }
+
             var result = _syncManager.GetJobItems(new SyncJobItemQuery
             {
                 JobId = job.Id,
@@ -577,7 +582,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             conversionOptions.ItemId = item.Id.ToString("N");
             conversionOptions.MediaSources = _mediaSourceManager.GetStaticMediaSources(item, false, user).ToList();
 
-            var streamInfo = new StreamBuilder(_logger).BuildVideoItem(conversionOptions);
+            var streamInfo = new StreamBuilder(_mediaEncoder, _logger).BuildVideoItem(conversionOptions);
             var mediaSource = streamInfo.MediaSource;
 
             // No sense creating external subs if we're already burning one into the video
@@ -632,6 +637,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
                     }, innerProgress, cancellationToken);
 
+                    jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                     _syncManager.OnConversionComplete(jobItem);
                 }
                 catch (OperationCanceledException)
@@ -668,6 +674,7 @@ namespace MediaBrowser.Server.Implementations.Sync
                     throw new InvalidOperationException(string.Format("Cannot direct stream {0} protocol", mediaSource.Protocol));
                 }
 
+                jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                 jobItem.MediaSource = mediaSource;
             }
 
@@ -779,7 +786,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             conversionOptions.ItemId = item.Id.ToString("N");
             conversionOptions.MediaSources = _mediaSourceManager.GetStaticMediaSources(item, false, user).ToList();
 
-            var streamInfo = new StreamBuilder(_logger).BuildAudioItem(conversionOptions);
+            var streamInfo = new StreamBuilder(_mediaEncoder, _logger).BuildAudioItem(conversionOptions);
             var mediaSource = streamInfo.MediaSource;
 
             jobItem.MediaSourceId = streamInfo.MediaSourceId;
@@ -819,6 +826,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
                     }, innerProgress, cancellationToken);
 
+                    jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                     _syncManager.OnConversionComplete(jobItem);
                 }
                 catch (OperationCanceledException)
@@ -855,6 +863,7 @@ namespace MediaBrowser.Server.Implementations.Sync
                     throw new InvalidOperationException(string.Format("Cannot direct stream {0} protocol", mediaSource.Protocol));
                 }
 
+                jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
                 jobItem.MediaSource = mediaSource;
             }
 
@@ -871,6 +880,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             jobItem.Progress = 50;
             jobItem.Status = SyncJobItemStatus.ReadyToTransfer;
+            jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
             await _syncManager.UpdateSyncJobItemInternal(jobItem).ConfigureAwait(false);
         }
 
@@ -880,6 +890,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             jobItem.Progress = 50;
             jobItem.Status = SyncJobItemStatus.ReadyToTransfer;
+            jobItem.ItemDateModifiedTicks = item.DateModified.Ticks;
             await _syncManager.UpdateSyncJobItemInternal(jobItem).ConfigureAwait(false);
         }