From c91e24cb5865aa2e6f019d2ed481c34cc7571970 Mon Sep 17 00:00:00 2001 From: goat Date: Sun, 16 Jun 2024 18:21:40 +0200 Subject: [PATCH] pi: "update all plugins" button must update banned plugins --- .../Windows/PluginInstaller/PluginInstallerWindow.cs | 2 +- Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs | 6 +++--- Dalamud/Plugin/Internal/PluginManager.cs | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs index 1033c9ea4..fe603b35f 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs @@ -726,7 +726,7 @@ internal class PluginInstallerWindow : Window, IDisposable this.loadingIndicatorKind = LoadingIndicatorKind.UpdatingAll; var toUpdate = this.pluginListUpdatable - .Where(x => x.InstalledPlugin.IsLoaded) + .Where(x => x.InstalledPlugin.IsWantedByAnyProfile) .ToList(); Task.Run(() => pluginManager.UpdatePluginsAsync(toUpdate, false)) diff --git a/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs b/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs index 4e2179be8..107dd0979 100644 --- a/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs +++ b/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs @@ -274,10 +274,10 @@ internal class AutoUpdateManager : IServiceType }); var progress = new Progress(); - progress.ProgressChanged += (_, progress) => + progress.ProgressChanged += (_, updateProgress) => { - notification.Content = Locs.NotificationContentUpdating(progress.CurrentPluginManifest.Name); - notification.Progress = (float)progress.PluginsProcessed / progress.TotalPlugins; + notification.Content = Locs.NotificationContentUpdating(updateProgress.CurrentPluginManifest.Name); + notification.Progress = (float)updateProgress.PluginsProcessed / updateProgress.TotalPlugins; }; var pluginStates = await this.pluginManager.UpdatePluginsAsync(updatablePlugins, this.isDryRun.Value, true, progress); diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index 60d2bbe28..64d3d8b93 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -1003,9 +1003,6 @@ internal class PluginManager : IInternalDisposableService if (plugin.InstalledPlugin.IsDev) continue; - if (!plugin.InstalledPlugin.IsWantedByAnyProfile) - continue; - if (plugin.InstalledPlugin.Manifest.ScheduledForDeletion) continue;