Merge pull request #2825 from X9VoiD/fix-updater-2

Actually prevent multiple invocations to Updater's Install button
OpenTabletDriver · Jul 3, 2023 · 55c3dc5 · 55c3dc5
2 parents 334d22e + 9fc97db
commit 55c3dc5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/OpenTabletDriver.UX/Windows/Updater/UpdaterWindow.cs b/OpenTabletDriver.UX/Windows/Updater/UpdaterWindow.cs
@@ -2,10 +2,10 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Eto.Drawing;
 using Eto.Forms;
-using OpenTabletDriver.Desktop.Interop;
 using OpenTabletDriver.Interop;
 using OpenTabletDriver.Plugin;
 using OpenTabletDriver.UX.Controls;
@@ -36,6 +36,7 @@ public UpdaterWindow()
             _ = InitializeAsync();
         }
 
+        private int _isUpdateRequested;
         private TaskCompletionSource<bool> _updateAvailable = new();
         public Task<bool> HasUpdates() => _updateAvailable.Task;
 
@@ -74,6 +75,9 @@ private async Task InitializeAsync()
 
         private void Update(object sender, EventArgs e) => Application.Instance.AsyncInvoke(async () =>
         {
+            if (Interlocked.Exchange(ref _isUpdateRequested, 1) != 0)
+                return;
+
             // Disallow multiple invocations
             (sender as Control)!.Enabled = false;
 

diff --git a/OpenTabletDriver.UX/Windows/WindowSingleton.cs b/OpenTabletDriver.UX/Windows/WindowSingleton.cs
@@ -5,17 +5,21 @@ namespace OpenTabletDriver.UX.Windows
 {
     public class WindowSingleton<T> where T : Window, new()
     {
+        private readonly object sync = new();
         private T window;
 
         public T GetWindow()
         {
-            if (window == null)
+            lock (sync)
             {
-                window = new T();
-                window.Closed += HandleWindowClosed;
-            }
+                if (window == null)
+                {
+                    window = new T();
+                    window.Closed += HandleWindowClosed;
+                }
 
-            return window;
+                return window;
+            }
         }
 
         public void Show()