michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/ApplicationHost.cs
View File

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

1
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
View File

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