Merge remote-tracking branch 'upstream/master' into ribbons

1 files changed, 10 insertions, 12 deletions

diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 2ecc6c9dd8..74b54fe2ce 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -305,22 +305,20 @@ namespace MediaBrowser.Providers.Manager
                             refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.ImageUpdate;
                         }
 
-                        if (!string.IsNullOrEmpty(localItem.Item.Name))
+                        if (string.IsNullOrWhiteSpace(localItem.Item.Name))
                         {
-                            MergeData(localItem.Item, temp, new List<MetadataFields>(), !options.ReplaceAllMetadata, true);
-                            refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataImport;
-
-                            // Only one local provider allowed per item
-                            hasLocalMetadata = true;
-                            break;
+                            localItem.Item.Name = item.Name ?? Path.GetFileNameWithoutExtension(item.Path);
                         }
 
-                        Logger.Error("Invalid local metadata found for: " + item.Path);
-                    }
-                    else
-                    {
-                        Logger.Debug("{0} returned no metadata for {1}", providerName, item.Path ?? item.Name);
+                        MergeData(localItem.Item, temp, new List<MetadataFields>(), !options.ReplaceAllMetadata, true);
+                        refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataImport;
+
+                        // Only one local provider allowed per item
+                        hasLocalMetadata = true;
+                        break;
                     }
+
+                    Logger.Debug("{0} returned no metadata for {1}", providerName, item.Path ?? item.Name);
                 }
                 catch (OperationCanceledException)
                 {