fix: lock profile manager while changing state

Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs

@@ -2898,7 +2898,7 @@ internal class PluginInstallerWindow : Window, IDisposable
     private void OnInstalledPluginsChanged()
     {
         var pluginManager = Service<PluginManager>.Get();
-        using var pmLock = pluginManager.LockPluginLists();
+        using var pmLock = pluginManager.GetSyncScope();
 
         lock (this.listLock)
         {

Dalamud/Plugin/Internal/PluginManager.cs

@@ -264,7 +264,7 @@ internal partial class PluginManager : IDisposable, IServiceType
     /// Get a disposable that will lock plugin lists while it is not disposed.
     /// </summary>
     /// <returns>The aforementioned disposable.</returns>
-    public IDisposable LockPluginLists() => new PluginListLockScope(this.pluginListLock);
+    public IDisposable GetSyncScope() => new ScopedSyncRoot(this.pluginListLock);
 
     /// <summary>
     /// Print to chat any plugin updates and whether they were successful.
@@ -1560,25 +1560,4 @@ internal partial class PluginManager
         var codebasePatch = typeof(PluginManager).GetMethod(nameof(AssemblyCodeBasePatch), BindingFlags.NonPublic | BindingFlags.Static);
         this.assemblyCodeBaseMonoHook = new MonoMod.RuntimeDetour.Hook(codebaseTarget, codebasePatch);
     }
-    
-    /// <summary>
-    /// Scope for plugin list locks.
-    /// </summary>
-    private class PluginListLockScope : IDisposable
-    {
-        private readonly object lockObj;
-
-        public PluginListLockScope(object lockObj)
-        {
-            this.lockObj = lockObj;
-            Monitor.Enter(lockObj);
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            Monitor.Exit(this.lockObj);
-        }
-    }
 }

Dalamud/Plugin/Internal/Profiles/Profile.cs

@@ -137,6 +137,8 @@ internal class Profile
     /// <returns>Null if this profile does not declare the plugin, true if the profile declares the plugin and wants it enabled, false if the profile declares the plugin and does not want it enabled.</returns>
     public bool? WantsPlugin(string internalName)
     {
+        using var lockScope = this.manager.GetSyncScope();
+
         var entry = this.modelV1.Plugins.FirstOrDefault(x => x.InternalName == internalName);
         return entry?.IsEnabled;
     }
@@ -150,6 +152,8 @@ internal class Profile
     /// <param name="apply">Whether or not the current state should immediately be applied.</param>
     public void AddOrUpdate(string internalName, bool state, bool apply = true)
     {
+        using var lockScope = this.manager.GetSyncScope();
+        
         Debug.Assert(!internalName.IsNullOrEmpty(), "!internalName.IsNullOrEmpty()");
 
         var existing = this.modelV1.Plugins.FirstOrDefault(x => x.InternalName == internalName);
@@ -186,6 +190,8 @@ internal class Profile
     /// <param name="apply">Whether or not the current state should immediately be applied.</param>
     public void Remove(string internalName, bool apply = true)
     {
+        using var lockScope = this.manager.GetSyncScope();
+        
         var entry = this.modelV1.Plugins.FirstOrDefault(x => x.InternalName == internalName);
         if (entry == null)
             throw new ArgumentException($"No plugin \"{internalName}\" in profile \"{this.Guid}\"");

Dalamud/Plugin/Internal/Profiles/ProfileManager.cs

@@ -41,7 +41,14 @@ internal class ProfileManager : IServiceType
     /// <summary>
     /// Gets the default profile.
     /// </summary>
-    public Profile DefaultProfile => this.profiles.First(x => x.IsDefaultProfile);
+    public Profile DefaultProfile
+    {
+        get
+        {
+            lock (this.profiles)
+                return this.profiles.First(x => x.IsDefaultProfile);
+        }
+    }
 
     /// <summary>
     /// Gets all profiles, including the default profile.
@@ -53,6 +60,12 @@ internal class ProfileManager : IServiceType
     /// </summary>
     public bool IsBusy => this.isBusy;
 
+    /// <summary>
+    /// Get a disposable that will lock the profile list while it is not disposed.
+    /// </summary>
+    /// <returns>The aforementioned disposable.</returns>
+    public ScopedSyncRoot GetSyncScope() => new ScopedSyncRoot(this.profiles);
+
     /// <summary>
     /// Check if any enabled profile wants a specific plugin enabled.
     /// </summary>
@@ -62,27 +75,30 @@ internal class ProfileManager : IServiceType
     /// <returns>Whether or not the plugin shall be enabled.</returns>
     public bool GetWantState(string internalName, bool defaultState, bool addIfNotDeclared = true)
     {
-        var want = false;
+        lock (this.profiles)
-        var wasInAnyProfile = false;
-
-        foreach (var profile in this.profiles)
         {
-            var state = profile.WantsPlugin(internalName);
+            var want = false;
-            if (state.HasValue)
+            var wasInAnyProfile = false;
+
+            foreach (var profile in this.profiles)
             {
-                want = want || (profile.IsEnabled && state.Value);
+                var state = profile.WantsPlugin(internalName);
-                wasInAnyProfile = true;
+                if (state.HasValue)
+                {
+                    want = want || (profile.IsEnabled && state.Value);
+                    wasInAnyProfile = true;
+                }
             }
-        }
 
-        if (!wasInAnyProfile && addIfNotDeclared)
+            if (!wasInAnyProfile && addIfNotDeclared)
-        {
+            {
-            Log.Warning("{Name} was not in any profile, adding to default with {Default}", internalName, defaultState);
+                Log.Warning("{Name} was not in any profile, adding to default with {Default}", internalName, defaultState);
-            this.DefaultProfile.AddOrUpdate(internalName, defaultState, false);
+                this.DefaultProfile.AddOrUpdate(internalName, defaultState, false);
-            return defaultState;
+                return defaultState;
-        }
+            }
 
-        return want;
+            return want;
+        }
     }
 
     /// <summary>
@@ -91,7 +107,10 @@ internal class ProfileManager : IServiceType
     /// <param name="internalName">The internal name of the plugin.</param>
     /// <returns>Whether or not the plugin is in any profile.</returns>
     public bool IsInAnyProfile(string internalName)
-        => this.profiles.Any(x => x.WantsPlugin(internalName) != null);
+    {
+        lock (this.profiles)
+            return this.profiles.Any(x => x.WantsPlugin(internalName) != null);
+    }
 
     /// <summary>
     /// Check whether a plugin is only in the default profile.
@@ -170,8 +189,9 @@ internal class ProfileManager : IServiceType
     public void ApplyAllWantStates()
     {
         var pm = Service<PluginManager>.Get();
-        using var pmLock = pm.LockPluginLists();
+        using var managerLock = pm.GetSyncScope();
-        
+        using var profilesLock = this.GetSyncScope();
+
         this.isBusy = true;
         Log.Information("Getting want states...");
 

Dalamud/Utility/ScopedSyncRoot.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Threading;
+
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Scope for plugin list locks.
+/// </summary>
+public class ScopedSyncRoot : IDisposable
+{
+    private readonly object lockObj;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ScopedSyncRoot"/> class.
+    /// </summary>
+    /// <param name="lockObj">The object to lock.</param>
+    public ScopedSyncRoot(object lockObj)
+    {
+        this.lockObj = lockObj;
+        Monitor.Enter(lockObj);
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        GC.SuppressFinalize(this);
+        Monitor.Exit(this.lockObj);
+    }
+}