Merge remote-tracking branch 'upstream/master' into split-api

1 files changed, 16 insertions, 5 deletions

diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index e21d8c7d1..084e91d50 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -247,23 +247,34 @@ namespace MediaBrowser.Common.Plugins
             }
             catch
             {
-                return (TConfigurationType)Activator.CreateInstance(typeof(TConfigurationType));
+                var config = (TConfigurationType)Activator.CreateInstance(typeof(TConfigurationType));
+                SaveConfiguration(config);
+                return config;
             }
         }
 
         /// <summary>
         /// Saves the current configuration to the file system.
         /// </summary>
-        public virtual void SaveConfiguration()
+        /// <param name="config">Configuration to save.</param>
+        public virtual void SaveConfiguration(TConfigurationType config)
         {
             lock (_configurationSaveLock)
             {
                 _directoryCreateFn(Path.GetDirectoryName(ConfigurationFilePath));
 
-                XmlSerializer.SerializeToFile(Configuration, ConfigurationFilePath);
+                XmlSerializer.SerializeToFile(config, ConfigurationFilePath);
             }
         }
 
+        /// <summary>
+        /// Saves the current configuration to the file system.
+        /// </summary>
+        public virtual void SaveConfiguration()
+        {
+            SaveConfiguration(Configuration);
+        }
+
         /// <inheritdoc />
         public virtual void UpdateConfiguration(BasePluginConfiguration configuration)
         {
@@ -274,9 +285,9 @@ namespace MediaBrowser.Common.Plugins
 
             Configuration = (TConfigurationType)configuration;
 
-            SaveConfiguration();
+            SaveConfiguration(Configuration);
 
-            ConfigurationChanged.Invoke(this, configuration);
+            ConfigurationChanged?.Invoke(this, configuration);
         }
 
         /// <inheritdoc />