Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

3 files changed, 32 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 4c8c7f3b7..89aedadee 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -32,6 +32,9 @@ namespace MediaBrowser.Controller.Entities
             People = new List<PersonInfo>();
             CriticReviews = new List<ItemReview>();
             Taglines = new List<string>();
+            ScreenshotImagePaths = new List<string>();
+            BackdropImagePaths = new List<string>();
+            ProductionLocations = new List<string>();
         }
 
         /// <summary>
@@ -731,6 +734,11 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>List{Video}.</returns>
         private List<Trailer> LoadLocalTrailers()
         {
+            if (LocationType != LocationType.FileSystem)
+            {
+                return new List<Trailer>();
+            }
+
             ItemResolveArgs resolveArgs;
 
             try
@@ -789,6 +797,11 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>List{Audio.Audio}.</returns>
         private List<Audio.Audio> LoadThemeSongs()
         {
+            if (LocationType != LocationType.FileSystem)
+            {
+                return new List<Audio.Audio>();
+            }
+
             ItemResolveArgs resolveArgs;
 
             try
@@ -847,6 +860,11 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>List{Video}.</returns>
         private List<Video> LoadThemeVideos()
         {
+            if (LocationType != LocationType.FileSystem)
+            {
+                return new List<Video>();
+            }
+
             ItemResolveArgs resolveArgs;
 
             try
diff --git a/MediaBrowser.Controller/Entities/IndexFolder.cs b/MediaBrowser.Controller/Entities/IndexFolder.cs
index 637c4195a..13fcba489 100644
--- a/MediaBrowser.Controller/Entities/IndexFolder.cs
+++ b/MediaBrowser.Controller/Entities/IndexFolder.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -64,6 +65,14 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        public override LocationType LocationType
+        {
+            get
+            {
+                return LocationType.Virtual;
+            }
+        }
+
         /// <summary>
         /// Override this to return the folder that should be used to construct a container
         /// for this item in an index.  GroupInIndex should be true as well.
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 893d2d0e0..593255989 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -115,6 +115,11 @@ namespace MediaBrowser.Controller.Entities.Movies
         /// <returns>IEnumerable{Video}.</returns>
         private IEnumerable<Video> LoadSpecialFeatures()
         {
+            if (LocationType != LocationType.FileSystem)
+            {
+                return new List<Video>();
+            }
+
             FileSystemInfo folder;
 
             try