fix: prevent av window deadlock

heliosphere-xiv · Sep 8, 2023 · 0a43f0c · 0a43f0c
1 parent c979227
commit 0a43f0c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/DownloadTask.cs b/DownloadTask.cs
@@ -157,7 +157,7 @@ await this.Plugin.Framework.RunOnFrameworkThread(() => {
             // probably antivirus (ioexception is being used by other process or
             // access denied)
             if (ex.IsAntiVirus()) {
-                await this.Plugin.PluginUi.AddIfNotPresentAsync(new AntiVirusWindow(this.Plugin));
+                this.Plugin.PluginUi.OpenAntiVirusWarning();
             } else {
                 ErrorHelper.Handle(ex, $"Error downloading version {this.Version}");
             }

diff --git a/Plugin.cs b/Plugin.cs
@@ -69,7 +69,7 @@ public Plugin() {
             var showWarning = await DependencyHelper.CheckDependencies(this);
             if (showWarning) {
                 this.IntegrityFailed = true;
-                this.PluginUi?.AddIfNotPresent(new AntiVirusWindow(this));
+                this.PluginUi?.OpenAntiVirusWarning();
             }
 
             return showWarning;
@@ -159,12 +159,8 @@ public Plugin() {
         this.LinkPayloads = new LinkPayloads(this);
         this.CommandHandler = new CommandHandler(this);
 
-        if (startWithAvWarning) {
-            this.PluginUi.AddIfNotPresent(new AntiVirusWindow(this));
-        }
-
-        if (checkTask is { Status: TaskStatus.RanToCompletion, Result: true }) {
-            this.PluginUi.AddIfNotPresent(new AntiVirusWindow(this));
+        if (startWithAvWarning || checkTask is { Status: TaskStatus.RanToCompletion, Result: true }) {
+            this.PluginUi.OpenAntiVirusWarning();
         }
 
         Task.Run(async () => await this.State.UpdatePackages());

diff --git a/Ui/PluginUi.cs b/Ui/PluginUi.cs
@@ -65,6 +65,10 @@ private void OpenConfig() {
         this.Visible = true;
     }
 
+    internal void OpenAntiVirusWarning() {
+        Task.Run(async () => await this.AddIfNotPresentAsync(new AntiVirusWindow(this.Plugin)));
+    }
+
     internal bool ShouldForceOpen(Tab tab) {
         var should = this.ForceOpen == tab;
         if (should) {