diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-04-04 13:22:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-04 13:22:49 +0200 |
| commit | 8eaefce14e8d325cfbabb1ade278d5e561a20f42 (patch) | |
| tree | 0ebab65da4145e5f55f37ef69fa1bea9f8b86ebb | |
| parent | fa64d8e4f244633a7dfb1599096cf70d82aca701 (diff) | |
| parent | 2ed0801be25921335b6509b6ebf9af61ad458409 (diff) | |
Merge pull request #5691 from Bond-009/nullref3
Fix possible nullref
| -rw-r--r-- | MediaBrowser.Controller/Providers/IProviderManager.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderManager.cs | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Providers/IProviderManager.cs b/MediaBrowser.Controller/Providers/IProviderManager.cs index 2f5b1d4a3..7bc56c82a 100644 --- a/MediaBrowser.Controller/Providers/IProviderManager.cs +++ b/MediaBrowser.Controller/Providers/IProviderManager.cs @@ -91,8 +91,11 @@ namespace MediaBrowser.Controller.Providers /// <summary> /// Adds the metadata providers. /// </summary> - void AddParts(IEnumerable<IImageProvider> imageProviders, IEnumerable<IMetadataService> metadataServices, IEnumerable<IMetadataProvider> metadataProviders, - IEnumerable<IMetadataSaver> savers, + void AddParts( + IEnumerable<IImageProvider> imageProviders, + IEnumerable<IMetadataService> metadataServices, + IEnumerable<IMetadataProvider> metadataProviders, + IEnumerable<IMetadataSaver> metadataSavers, IEnumerable<IExternalId> externalIds); /// <summary> diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs index d581dd434..b4b0b826f 100644 --- a/MediaBrowser.Providers/Manager/ProviderManager.cs +++ b/MediaBrowser.Providers/Manager/ProviderManager.cs @@ -60,8 +60,8 @@ namespace MediaBrowser.Providers.Manager private IMetadataService[] _metadataServices = Array.Empty<IMetadataService>(); private IMetadataProvider[] _metadataProviders = Array.Empty<IMetadataProvider>(); - private IEnumerable<IMetadataSaver> _savers; - private IExternalId[] _externalIds; + private IMetadataSaver[] _savers = Array.Empty<IMetadataSaver>(); + private IExternalId[] _externalIds = Array.Empty<IExternalId>(); private bool _isProcessingRefreshQueue; private bool _disposed; @@ -125,7 +125,7 @@ namespace MediaBrowser.Providers.Manager _externalIds = externalIds.OrderBy(i => i.ProviderName).ToArray(); _savers = metadataSavers - .Where(i => !(i is IConfigurableProvider configurable) || configurable.IsEnabled) + .Where(i => i is not IConfigurableProvider configurable || configurable.IsEnabled) .ToArray(); } |