diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-05 08:18:04 -0500 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-05 08:18:04 -0500 |
| commit | cdc7d83c223c4aa92591eef4675b53c030e3bcbf (patch) | |
| tree | e558bd32e32b70d82cb3adf30b1cd068a3c09220 | |
| parent | b936c530aa662bd08ea60f4283409f26cc69feb3 (diff) | |
| parent | d33e0a4e2c59783c785c992ea0c3a31596ae3058 (diff) | |
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index ac37cfe07..9330d5719 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -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(); diff --git a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs index 6bef1cd5a..0c8d9ae9c 100644 --- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs +++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs @@ -59,6 +59,7 @@ namespace MediaBrowser.MediaEncoding.Attachments { throw new ArgumentNullException(nameof(item)); } + if (string.IsNullOrWhiteSpace(mediaSourceId)) { throw new ArgumentNullException(nameof(mediaSourceId)); |