diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-04-03 22:24:58 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-04-03 22:24:58 -0400 |
| commit | 481e6635b49fd096bcf47da6115a7827254f84a1 (patch) | |
| tree | 901037b4799dc2cc9600af2ea4f74c5303889a58 /MediaBrowser.Server.Implementations | |
| parent | f9ab5cfad22afd9e5d330276a15f7a84828dbdb8 (diff) | |
| parent | d94d8e88af4880b1d3b558eef339b979363b5ce6 (diff) | |
Merge pull request #1068 from MediaBrowser/master
3.0.5572.0
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Dto/DtoService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index a35549671..8934c9c8f 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -282,7 +282,7 @@ namespace MediaBrowser.Server.Implementations.Dto } } } - + if (fields.Contains(ItemFields.Studios)) { AttachStudios(dto, item); diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs index c0435a81e..185c3464e 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs @@ -394,7 +394,7 @@ namespace MediaBrowser.Server.Implementations.Sync AddMetadata = false }); - await SyncJobItems(result.Items, true, progress, cancellationToken).ConfigureAwait(false); + await SyncJobItems(result.Items, enableConversion, progress, cancellationToken).ConfigureAwait(false); } public async Task SyncJobItems(SyncJobItem[] items, bool enableConversion, IProgress<double> progress, CancellationToken cancellationToken) |