From a4f7eb84cd535017b6d5bd5c7c80efd56a60b4a9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 13 Jun 2013 14:45:58 -0400
Subject: fixes #347 - File Properties in Video file formats override local xml

---
 MediaBrowser.Controller/Entities/BaseItem.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index fbed70af9a..264f66945a 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -764,7 +764,7 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }));
 
-            var trailers = LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
+            return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
             {
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
                 var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
@@ -776,9 +776,8 @@ namespace MediaBrowser.Controller.Entities
                 }
 
                 return video;
-            }).ToList();
 
-            return trailers;
+            }).ToList();
         }
 
         /// <summary>
-- 
cgit v1.2.3