better exception handling

mdhiggins · Nov 24, 2020 · 5787644 · 5787644
1 parent 2129f7b
commit 5787644
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/CenterTaskbar/Program.cs b/CenterTaskbar/Program.cs
@@ -166,25 +166,34 @@ private void Exit(object sender, EventArgs e)
 
         private void CancelPositionThread()
         {
-            _loopCancellationTokenSource.Cancel();
-            Parallel.ForEach(_positionThreads.Values.ToList(), theTask =>
+            try
             {
-                try
-                {
-                    // Give the thread time to exit gracefully.
-                    if (theTask.Wait(OneSecond * 3)) return;
-                }
-                catch (OperationCanceledException e)
-                {
-                    Console.WriteLine($"{nameof(OperationCanceledException)} thrown with message: {e.Message}");
-                }
-                finally
+                _loopCancellationTokenSource.Cancel();
+                Parallel.ForEach(_positionThreads.Values.ToList(), theTask =>
                 {
-                    theTask.Dispose();
-                }
-            });
-
-            _loopCancellationTokenSource = new CancellationTokenSource();
+                    try
+                    {
+                        // Give the thread time to exit gracefully.
+                        if (theTask.Wait(OneSecond * 3)) return;
+                    }
+                    catch (OperationCanceledException e)
+                    {
+                        Console.WriteLine($"{nameof(OperationCanceledException)} thrown with message: {e.Message}");
+                    }
+                    finally
+                    {
+                        theTask.Dispose();
+                    }
+                });
+            }
+            catch (OperationCanceledException e)
+            {
+                Console.WriteLine($"{nameof(OperationCanceledException)} thrown with message: {e.Message}");
+            }
+            finally
+            {
+                _loopCancellationTokenSource = new CancellationTokenSource();
+            }
         }
 
         private void Restart(object sender, EventArgs e)