diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs index bd14d181a..04ad4e700 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs @@ -338,7 +338,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller throw new ArgumentOutOfRangeException(); } - if (DateTime.Now - this.timeLoaded > TimeSpan.FromSeconds(90) && isWaitingManager) + if (DateTime.Now - this.timeLoaded > TimeSpan.FromSeconds(90) && !pluginManager.PluginsReady) { ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed); ImGuiHelpers.CenteredText("This is embarrassing, but..."); @@ -1035,7 +1035,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller private void DrawPluginCategoryContent() { - var ready = this.DrawPluginListLoading(); + var ready = this.DrawPluginListLoading() && !this.AnyOperationInProgress; if (!this.categoryManager.IsSelectionValid || !ready) { return; diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index 05ab3a85a..e243c1b05 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -151,7 +151,7 @@ internal partial class PluginManager : IDisposable, IServiceType /// /// Gets a value indicating whether all added repos are not in progress. /// - public bool ReposReady => this.Repos.All(repo => repo.State != PluginRepositoryState.InProgress || repo.State != PluginRepositoryState.Fail); + public bool ReposReady => this.Repos.All(repo => repo.State != PluginRepositoryState.InProgress); /// /// Gets a value indicating whether the plugin manager started in safe mode.