Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments

This commit is contained in:
Andrew Mahone 2019-11-05 08:18:04 -05:00
commit cdc7d83c22
2 changed files with 2 additions and 1 deletions

View file

@ -908,7 +908,7 @@ namespace Emby.Server.Implementations
AttachmentExtractor = new MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor(LibraryManager, LoggerFactory, ApplicationPaths, FileSystemManager, MediaEncoder, MediaSourceManager, ProcessFactory);
serviceCollection.AddSingleton(AttachmentExtractor);
serviceCollection.AddSingleton<MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor>();
_displayPreferencesRepository.Initialize();

View file

@ -59,6 +59,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
{
throw new ArgumentNullException(nameof(item));
}
if (string.IsNullOrWhiteSpace(mediaSourceId))
{
throw new ArgumentNullException(nameof(mediaSourceId));