From ccb4e5851963a95faa50f9c9403078a275e4cc7d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 4 Nov 2014 22:41:14 -0500
Subject: [PATCH] 3.0.5421

---
 MediaBrowser.Api/Library/LibraryService.cs    |  2 +-
 .../Manager/ProviderManager.cs                | 21 ++++++++++++-------
 SharedVersion.cs                              |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index b1ee30c94..231f5e9a6 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -763,7 +763,7 @@ namespace MediaBrowser.Api.Library
 
             if (!inherit)
             {
-                return null;
+                return new List<Guid>();
             }
 
             hasSoundtracks = item.Parents.OfType<IHasSoundtracks>().FirstOrDefault();
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 6bb3a2dd3..cdf1e788c 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -710,7 +710,7 @@ namespace MediaBrowser.Providers.Manager
             // Give it a dummy path just so that it looks like a file system item
             var dummy = new TItemType
             {
-                Path = "C:\\",
+                Path = BaseItem.GetInternalMetadataPathForId(Guid.NewGuid()),
 
                 // Dummy this up to fool the local trailer check
                 Parent = new Folder()
@@ -737,13 +737,20 @@ namespace MediaBrowser.Providers.Manager
 
             foreach (var provider in providers)
             {
-                var results = await GetSearchResults(provider, searchInfo.SearchInfo, cancellationToken).ConfigureAwait(false);
-
-                var list = results.ToList();
-
-                if (list.Count > 0)
+                try
                 {
-                    return list.Take(10);
+                    var results = await GetSearchResults(provider, searchInfo.SearchInfo, cancellationToken).ConfigureAwait(false);
+
+                    var list = results.ToList();
+
+                    if (list.Count > 0)
+                    {
+                        return list.Take(10);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // Logged at lower levels
                 }
             }
 
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 3eaf9ea1c..a8189830a 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -3,6 +3,6 @@
 #if (DEBUG)
 [assembly: AssemblyVersion("3.0.*")]
 #else
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5416.0")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5421.0")]
 #endif