diff options
| author | David <daullmer@gmail.com> | 2020-07-21 21:56:24 +0200 |
|---|---|---|
| committer | David <daullmer@gmail.com> | 2020-07-21 21:56:24 +0200 |
| commit | be8cf1e9ef5f24903c406f5cdbe985e84ffeb102 (patch) | |
| tree | b3a925ec3cf8afd8a04eeaad94861b258dfec70f /MediaBrowser.Providers/Manager/ProviderUtils.cs | |
| parent | 9a2bcd6266fb222491abe6ea31d5e7e734699d5f (diff) | |
| parent | 5b57c81ee14ce585161b9ac331e6e3528826b815 (diff) | |
Merge branch 'api-migration' into api-syncplay
# Conflicts:
# MediaBrowser.Api/SyncPlay/SyncPlayService.cs
Diffstat (limited to 'MediaBrowser.Providers/Manager/ProviderUtils.cs')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderUtils.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs index 7f2a1410b..a4fd6ca84 100644 --- a/MediaBrowser.Providers/Manager/ProviderUtils.cs +++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS1591 + using System; using System.Collections.Generic; using System.Linq; @@ -26,6 +28,7 @@ namespace MediaBrowser.Providers.Manager { throw new ArgumentNullException(nameof(source)); } + if (target == null) { throw new ArgumentNullException(nameof(target)); @@ -111,7 +114,6 @@ namespace MediaBrowser.Providers.Manager if (replaceData || targetResult.People == null || targetResult.People.Count == 0) { targetResult.People = sourceResult.People; - } else if (targetResult.People != null && sourceResult.People != null) { |
