ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 20:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1007 from Aireil/fix_concurrency

Browse source
This commit is contained in:
goat 2022-09-14 18:15:22 +02:00 • committed by GitHub
commit 0920ff941b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -338,7 +338,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
throw new ArgumentOutOfRangeException(); 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); ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
ImGuiHelpers.CenteredText("This is embarrassing, but..."); ImGuiHelpers.CenteredText("This is embarrassing, but...");
@ -1035,7 +1035,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
private void DrawPluginCategoryContent() private void DrawPluginCategoryContent()
{ {
var ready = this.DrawPluginListLoading(); var ready = this.DrawPluginListLoading() && !this.AnyOperationInProgress;
if (!this.categoryManager.IsSelectionValid || !ready) if (!this.categoryManager.IsSelectionValid || !ready)
{ {
return; return;

2
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -151,7 +151,7 @@ internal partial class PluginManager : IDisposable, IServiceType
/// <summary> /// <summary>
/// Gets a value indicating whether all added repos are not in progress. /// Gets a value indicating whether all added repos are not in progress.
/// </summary> /// </summary>
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);
/// <summary> /// <summary>
/// Gets a value indicating whether the plugin manager started in safe mode. /// Gets a value indicating whether the plugin manager started in safe mode.