From c93740461e5cef99deb378e587b75cf74950b94e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 2 Jan 2015 00:36:27 -0500
Subject: support audio sync transcoding

---
 .../Library/LibraryManager.cs                              | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index b4a4c7e9a..37a68b52b 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1556,25 +1556,25 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             // Types cannot be overridden, so go from the top down until we find a configured content type
 
-            var type = GetTopFolderContentType(item);
+            var type = GetInheritedContentType(item);
 
             if (!string.IsNullOrWhiteSpace(type))
             {
                 return type;
             }
 
-            type = GetInheritedContentType(item);
+            return GetConfiguredContentType(item);
+        }
+
+        public string GetInheritedContentType(BaseItem item)
+        {
+            var type = GetTopFolderContentType(item);
 
             if (!string.IsNullOrWhiteSpace(type))
             {
                 return type;
             }
 
-            return GetConfiguredContentType(item);
-        }
-
-        public string GetInheritedContentType(BaseItem item)
-        {
             return item.Parents
                 .Select(GetConfiguredContentType)
                 .LastOrDefault(i => !string.IsNullOrWhiteSpace(i));
-- 
cgit v1.2.3