Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 13 insertions, 0 deletions

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 817018b49..ed0190a23 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -225,6 +225,8 @@ namespace MediaBrowser.Common.Implementations
                 Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false));
 
                 Task.Run(() => ConfigureAutoRunAtStartup());
+
+                ConfigurationManager.ConfigurationUpdated += ConfigurationManager_ConfigurationUpdated;
             });
         }
 
@@ -478,6 +480,17 @@ namespace MediaBrowser.Common.Implementations
         protected abstract string ProductShortcutPath { get; }
 
         /// <summary>
+        /// Handles the ConfigurationUpdated event of the ConfigurationManager control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
+        /// <exception cref="System.NotImplementedException"></exception>
+        void ConfigurationManager_ConfigurationUpdated(object sender, EventArgs e)
+        {
+            ConfigureAutoRunAtStartup();
+        }
+        
+        /// <summary>
         /// Configures the auto run at startup.
         /// </summary>
         private void ConfigureAutoRunAtStartup()