From be4e5eff9ce6a5d93088625575dcc888d955ba69 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 16 Oct 2020 14:58:37 +0100
Subject: [PATCH 1/4] Update BasePlugin.cs

---
 MediaBrowser.Common/Plugins/BasePlugin.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index 8545fd5dcf..a6130a8e7a 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -252,20 +252,23 @@ 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);
             }
         }
 
@@ -279,7 +282,7 @@ namespace MediaBrowser.Common.Plugins
 
             Configuration = (TConfigurationType)configuration;
 
-            SaveConfiguration();
+            SaveConfiguration(Configuration);
         }
 
         /// <inheritdoc />

From 3ffdcfdb802079ee9ad3e76527b4519f3fe4458a Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 19 Nov 2020 09:03:03 +0000
Subject: [PATCH 2/4] Update BasePlugin.cs

---
 MediaBrowser.Common/Plugins/BasePlugin.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index a6130a8e7a..d9debeee35 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -271,6 +271,19 @@ namespace MediaBrowser.Common.Plugins
                 XmlSerializer.SerializeToFile(config, ConfigurationFilePath);
             }
         }
+        
+        /// <summary>
+        /// Saves the current configuration to the file system.
+        /// </summary>
+        public virtual void SaveConfiguration()
+        {
+            lock (_configurationSaveLock)
+            {
+                _directoryCreateFn(Path.GetDirectoryName(ConfigurationFilePath));
+
+                XmlSerializer.SerializeToFile(Configuration, ConfigurationFilePath);
+            }
+        }
 
         /// <inheritdoc />
         public virtual void UpdateConfiguration(BasePluginConfiguration configuration)

From 9c3e484c0e711ec72bd7d3cea068fe750627e43b Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 19 Nov 2020 18:14:38 +0000
Subject: [PATCH 3/4] Update BasePlugin.cs

---
 MediaBrowser.Common/Plugins/BasePlugin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index e030416cac..6de536a163 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -266,7 +266,7 @@ namespace MediaBrowser.Common.Plugins
                 XmlSerializer.SerializeToFile(config, ConfigurationFilePath);
             }
         }
-        
+
         /// <summary>
         /// Saves the current configuration to the file system.
         /// </summary>

From 47f3bb33f952ff9f8f8a8307bb3bd92636f156bc Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 20 Nov 2020 09:03:11 +0000
Subject: [PATCH 4/4] Update BasePlugin.cs

---
 MediaBrowser.Common/Plugins/BasePlugin.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index 6de536a163..084e91d500 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -272,12 +272,7 @@ namespace MediaBrowser.Common.Plugins
         /// </summary>
         public virtual void SaveConfiguration()
         {
-            lock (_configurationSaveLock)
-            {
-                _directoryCreateFn(Path.GetDirectoryName(ConfigurationFilePath));
-
-                XmlSerializer.SerializeToFile(Configuration, ConfigurationFilePath);
-            }
+            SaveConfiguration(Configuration);
         }
 
         /// <inheritdoc />