From 95ae1c5f7b2dd0a9905ab78c3c42e056b5417d1c 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

---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 81c1bd610..ced5210c5 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -162,6 +162,8 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The dashboard source path.</value>
         public string DashboardSourcePath { get; set; }
 
+        public bool MergeMetadataAndImagesByName { get; set; }
+        
         /// <summary>
         /// Gets or sets the image saving convention.
         /// </summary>
@@ -211,6 +213,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         public ServerConfiguration()
         {
+            MergeMetadataAndImagesByName = true;
             Migrations = new string[] { };
 
             ImageSavingConvention = ImageSavingConvention.Compatible;
-- 
cgit v1.2.3