1 files changed, 24 insertions, 15 deletions

diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index d7df37332..1a5c35df8 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -35,7 +35,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
         public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
             : base(applicationPaths, logManager, xmlSerializer, fileSystem)
         {
-            UpdateItemsByNamePath();
             UpdateMetadataPath();
         }
 
@@ -73,7 +72,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
         /// </summary>
         protected override void OnConfigurationUpdated()
         {
-            UpdateItemsByNamePath();
             UpdateMetadataPath();
 
             base.OnConfigurationUpdated();
@@ -87,19 +85,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
         }
 
         /// <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>
         private void UpdateMetadataPath()
@@ -163,12 +148,36 @@ namespace MediaBrowser.Server.Implementations.Configuration
             ValidateItemByNamePath(newConfig);
             ValidatePathSubstitutions(newConfig);
             ValidateMetadataPath(newConfig);
+            ValidateSslCertificate(newConfig);
 
             EventHelper.FireEventIfNotNull(ConfigurationUpdating, this, new GenericEventArgs<ServerConfiguration> { Argument = newConfig }, Logger);
 
             base.ReplaceConfiguration(newConfiguration);
         }
 
+
+        /// <summary>
+        /// Validates the SSL certificate.
+        /// </summary>
+        /// <param name="newConfig">The new configuration.</param>
+        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        private void ValidateSslCertificate(BaseApplicationConfiguration newConfig)
+        {
+            var serverConfig = (ServerConfiguration)newConfig;
+
+            var newPath = serverConfig.CertificatePath;
+
+            if (!string.IsNullOrWhiteSpace(newPath)
+                && !string.Equals(Configuration.CertificatePath ?? string.Empty, newPath))
+            {
+                // Validate
+                if (!FileSystem.FileExists(newPath))
+                {
+                    throw new FileNotFoundException(string.Format("Certificate file '{0}' does not exist.", newPath));
+                }
+            }
+        }
+
         private void ValidatePathSubstitutions(ServerConfiguration newConfig)
         {
             foreach (var map in newConfig.PathSubstitutions)