Merge branch 'master' into sort-nfo-data

1 files changed, 4 insertions, 3 deletions

diff --git a/MediaBrowser.Common/Plugins/BasePluginOfT.cs b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
index 116e9cef8..58992ecd7 100644
--- a/MediaBrowser.Common/Plugins/BasePluginOfT.cs
+++ b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Threading;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Plugins;
 using MediaBrowser.Model.Serialization;
@@ -20,12 +21,12 @@ namespace MediaBrowser.Common.Plugins
         /// <summary>
         /// The configuration sync lock.
         /// </summary>
-        private readonly object _configurationSyncLock = new object();
+        private readonly Lock _configurationSyncLock = new();
 
         /// <summary>
         /// The configuration save lock.
         /// </summary>
-        private readonly object _configurationSaveLock = new object();
+        private readonly Lock _configurationSaveLock = new();
 
         /// <summary>
         /// The configuration.
@@ -193,7 +194,7 @@ namespace MediaBrowser.Common.Plugins
             }
             catch
             {
-                var config = (TConfigurationType)Activator.CreateInstance(typeof(TConfigurationType));
+                var config = Activator.CreateInstance<TConfigurationType>();
                 SaveConfiguration(config);
                 return config;
             }