ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: lock lists in plugin manager when sorting

Browse source
This commit is contained in:
goat 2023-01-18 22:39:23 +01:00
parent 379a4422a2
commit aa58edec9a
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -46,6 +46,8 @@ internal class PluginInstallerWindow : Window, IDisposable
private readonly DateTime timeLoaded; private readonly DateTime timeLoaded;
private readonly object listLock = new();
#region Image Tester State #region Image Tester State
private string[] testerImagePaths = new string[5]; private string[] testerImagePaths = new string[5];
@ -431,7 +433,8 @@ internal class PluginInstallerWindow : Window, IDisposable
this.sortKind = selectable.SortKind; this.sortKind = selectable.SortKind;
this.filterText = selectable.Localization; this.filterText = selectable.Localization;
this.ResortPlugins(); lock(this.listLock)
this.ResortPlugins();
} }
} }
@ -2684,11 +2687,14 @@ internal class PluginInstallerWindow : Window, IDisposable
{ {
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
// By removing installed plugins only when the available plugin list changes (basically when the window is lock (this.listLock)
// opened), plugins that have been newly installed remain in the available plugin list as installed. {
this.pluginListAvailable = pluginManager.AvailablePlugins.ToList(); // By removing installed plugins only when the available plugin list changes (basically when the window is
this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList(); // opened), plugins that have been newly installed remain in the available plugin list as installed.
this.ResortPlugins(); this.pluginListAvailable = pluginManager.AvailablePlugins.ToList();
this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList();
this.ResortPlugins();
}
this.UpdateCategoriesOnPluginsChange(); this.UpdateCategoriesOnPluginsChange();
} }
@ -2697,10 +2703,13 @@ internal class PluginInstallerWindow : Window, IDisposable
{ {
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
this.pluginListInstalled = pluginManager.InstalledPlugins.ToList(); lock (this.listLock)
this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList(); {
this.hasDevPlugins = this.pluginListInstalled.Any(plugin => plugin.IsDev); this.pluginListInstalled = pluginManager.InstalledPlugins.ToList();
this.ResortPlugins(); this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList();
this.hasDevPlugins = this.pluginListInstalled.Any(plugin => plugin.IsDev);
this.ResortPlugins();
}
this.UpdateCategoriesOnPluginsChange(); this.UpdateCategoriesOnPluginsChange();
} }