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

pull/1838/head
Andrew Mahone 5 years ago
commit cdc7d83c22

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

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

Loading…
Cancel
Save