Merge pull request #3 from MediaBrowser/master

Sync with Master

1 files changed, 9 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index da3861682..59267e856 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -1,8 +1,10 @@
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Implementations.Configuration;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
@@ -29,6 +31,8 @@ namespace MediaBrowser.Server.Implementations.Configuration
             UpdateMetadataPath();
         }
 
+        public event EventHandler<GenericEventArgs<ServerConfiguration>> ConfigurationUpdating;
+
         /// <summary>
         /// Gets the type of the configuration.
         /// </summary>
@@ -73,8 +77,8 @@ namespace MediaBrowser.Server.Implementations.Configuration
         /// </summary>
         private void UpdateItemsByNamePath()
         {
-            ((ServerApplicationPaths) ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ? 
-                null : 
+            ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ?
+                null :
                 Configuration.ItemsByNamePath;
         }
 
@@ -105,13 +109,15 @@ namespace MediaBrowser.Server.Implementations.Configuration
         /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
         public override void ReplaceConfiguration(BaseApplicationConfiguration newConfiguration)
         {
-            var newConfig = (ServerConfiguration) newConfiguration;
+            var newConfig = (ServerConfiguration)newConfiguration;
 
             ValidateItemByNamePath(newConfig);
             ValidateTranscodingTempPath(newConfig);
             ValidatePathSubstitutions(newConfig);
             ValidateMetadataPath(newConfig);
 
+            EventHelper.FireEventIfNotNull(ConfigurationUpdating, this, new GenericEventArgs<ServerConfiguration> { Argument = newConfig }, Logger);
+
             base.ReplaceConfiguration(newConfiguration);
         }