Fix race condition in TimerUpdateTrigger stop

2025-12-13 01:58:30 +00:00 · 2021-08-23 18:48:19 +02:00 · 2021-08-23 18:48:19 +02:00 · 1fa466809e
commit 1fa466809e
parent e332d79a47
1 changed files with 14 additions and 4 deletions
--- a/RGB.NET.Core/Update/TimerUpdateTrigger.cs
+++ b/RGB.NET.Core/Update/TimerUpdateTrigger.cs
@ -92,10 +92,20 @@ namespace RGB.NET.Core
                if (UpdateTask != null)
                {
                    UpdateTokenSource?.Cancel();
-                    // ReSharper disable once MethodSupportsCancellation
-                    UpdateTask.Wait();
-                    UpdateTask.Dispose();
-                    UpdateTask = null;
+                    try
+                    {
+                        // ReSharper disable once MethodSupportsCancellation
+                        UpdateTask.Wait();
+                    }
+                    catch (AggregateException)
+                    {
+                        // ignored
+                    }
+                    finally
+                    {
+                        UpdateTask.Dispose();
+                        UpdateTask = null;
+                    }
                }
            }
        }