From 609d2283c6dc7572b7bfbf5cd55c8c2ce74e29a4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 23 Jul 2015 22:48:10 -0400
Subject: update polymer

---
 MediaBrowser.Providers/Manager/MetadataService.cs | 18 +++++++++---------
 MediaBrowser.Providers/Manager/ProviderUtils.cs   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'MediaBrowser.Providers/Manager')

diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index c3d1ec0809..9aa6485f10 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -194,6 +194,15 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
+        protected async Task SaveItem(MetadataResult<TItemType> result, ItemUpdateType reason, CancellationToken cancellationToken)
+        {
+            if (result.Item.SupportsPeople && result.People != null)
+            {
+                await LibraryManager.UpdatePeople(result.Item as BaseItem, result.People.ToList());
+            }
+            await result.Item.UpdateToRepository(reason, cancellationToken).ConfigureAwait(false);
+        }
+
         private readonly Task _cachedTask = Task.FromResult(true);
         protected virtual Task AfterMetadataRefresh(TItemType item, MetadataRefreshOptions refreshOptions, CancellationToken cancellationToken)
         {
@@ -328,15 +337,6 @@ namespace MediaBrowser.Providers.Manager
             return providers;
         }
 
-        protected async Task SaveItem(MetadataResult<TItemType> result, ItemUpdateType reason, CancellationToken cancellationToken)
-        {
-            if (result.Item.SupportsPeople)
-            {
-                await LibraryManager.UpdatePeople(result.Item as BaseItem, result.People);
-            }
-            await result.Item.UpdateToRepository(reason, cancellationToken).ConfigureAwait(false);
-        }
-
         public bool CanRefresh(IHasMetadata item)
         {
             return item is TItemType;
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs
index a0a0493d54..fa4840f103 100644
--- a/MediaBrowser.Providers/Manager/ProviderUtils.cs
+++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs
@@ -105,9 +105,9 @@ namespace MediaBrowser.Providers.Manager
 
             if (!lockedFields.Contains(MetadataFields.Cast))
             {
-                if (replaceData || targetResult.People.Count == 0)
+                if (replaceData || targetResult.People == null || targetResult.People.Count == 0)
                 {
-                    targetResult.People = sourceResult.People;
+                    targetResult.People = sourceResult.People ?? new List<PersonInfo>();
                 }
             }
 
-- 
cgit v1.2.3