From 106a2f3e1a0bfee9e056ef22b94599c7b2a47530 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 27 Jan 2016 01:31:31 -0500
Subject: add back MergeMetadataAndImagesByName

Conflicts:
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
---
 .../Configuration/ServerConfigurationManager.cs           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 6b668da47..d7df37332 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -35,6 +35,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
         public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
             : base(applicationPaths, logManager, xmlSerializer, fileSystem)
         {
+            UpdateItemsByNamePath();
             UpdateMetadataPath();
         }
 
@@ -72,6 +73,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
         /// </summary>
         protected override void OnConfigurationUpdated()
         {
+            UpdateItemsByNamePath();
             UpdateMetadataPath();
 
             base.OnConfigurationUpdated();
@@ -84,6 +86,19 @@ namespace MediaBrowser.Server.Implementations.Configuration
             UpdateTranscodingTempPath();
         }
 
+        /// <summary>
+        /// Updates the items by name path.
+        /// </summary>
+        private void UpdateItemsByNamePath()
+        {
+            if (!Configuration.MergeMetadataAndImagesByName)
+            {
+                ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ?
+                    null :
+                    Configuration.ItemsByNamePath;
+            }
+        }
+
         /// <summary>
         /// Updates the metadata path.
         /// </summary>
-- 
cgit v1.2.3