Merge pull request #1068 from MediaBrowser/master

3.0.5572.0
This commit is contained in:
Luke
2015-04-03 22:24:58 -04:00
3 changed files with 42 additions and 29 deletions

View File

@@ -282,7 +282,7 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
}
if (fields.Contains(ItemFields.Studios))
{
AttachStudios(dto, item);

View File

@@ -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)