Merge branch 'beta'

1 files changed, 3 insertions, 6 deletions

diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index 9d5ef2035..c3e24090c 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -1,11 +1,8 @@
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Users;
-using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Runtime.Serialization;
 using MediaBrowser.Controller.Entities.Movies;
 
@@ -24,11 +21,11 @@ namespace MediaBrowser.Controller.Entities
             Taglines = new List<string>();
             Keywords = new List<string>();
             ProductionLocations = new List<string>();
-            TrailerTypes = new List<TrailerType>();
+            TrailerTypes = new List<TrailerType> { TrailerType.LocalTrailer };
         }
 
         public List<TrailerType> TrailerTypes { get; set; }
-        
+
         public float? Metascore { get; set; }
 
         public List<MediaUrl> RemoteTrailers { get; set; }
@@ -89,7 +86,7 @@ namespace MediaBrowser.Controller.Entities
             var info = GetItemLookupInfo<TrailerInfo>();
 
             info.IsLocalTrailer = TrailerTypes.Contains(TrailerType.LocalTrailer);
-            
+
             if (!IsInMixedFolder)
             {
                 info.Name = System.IO.Path.GetFileName(ContainingFolderPath);