Catching OperationCanceledException instead of TaskCancelledException

BartoszCichecki · Aug 19, 2023 · 4a1e67b · 4a1e67b
1 parent c69b26d
commit 4a1e67b
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/LenovoLegionToolkit.Lib/Controllers/GPUController.cs b/LenovoLegionToolkit.Lib/Controllers/GPUController.cs
@@ -87,7 +87,7 @@ public async Task StopAsync(bool waitForFinish = false)
                 {
                     await _refreshTask.ConfigureAwait(false);
                 }
-                catch (TaskCanceledException) { }
+                catch (OperationCanceledException) { }
             }
 
             if (Log.Instance.IsTraceEnabled)
@@ -191,7 +191,7 @@ private async Task RefreshLoopAsync(int delay, int interval, CancellationToken t
                     break;
             }
         }
-        catch (Exception ex) when (ex is not TaskCanceledException)
+        catch (Exception ex) when (ex is not OperationCanceledException)
         {
             if (Log.Instance.IsTraceEnabled)
                 Log.Instance.Trace($"Exception occurred", ex);

diff --git a/LenovoLegionToolkit.Lib/Controllers/SpectrumKeyboardBacklightController.cs b/LenovoLegionToolkit.Lib/Controllers/SpectrumKeyboardBacklightController.cs
@@ -532,7 +532,7 @@ private async Task AuroraRefreshAsync(int profile, CancellationToken token)
                 await delay.ConfigureAwait(false);
             }
         }
-        catch (TaskCanceledException) { }
+        catch (OperationCanceledException) { }
         catch (Exception ex)
         {
             if (Log.Instance.IsTraceEnabled)

diff --git a/LenovoLegionToolkit.Lib/Utils/ThrottleLastDispatcher.cs b/LenovoLegionToolkit.Lib/Utils/ThrottleLastDispatcher.cs
@@ -34,7 +34,7 @@ public async Task DispatchAsync(Func<Task> task)
 
             await task().ConfigureAwait(false);
         }
-        catch (TaskCanceledException)
+        catch (OperationCanceledException)
         {
             if (_tag is not null && Log.Instance.IsTraceEnabled)
                 Log.Instance.Trace($"Throttling... [tag={_tag}]");

diff --git a/LenovoLegionToolkit.WPF/Controls/Dashboard/SensorsControl.xaml.cs b/LenovoLegionToolkit.WPF/Controls/Dashboard/SensorsControl.xaml.cs
@@ -100,7 +100,7 @@ private void Refresh()
                     Dispatcher.Invoke(() => UpdateValues(data));
                     await Task.Delay(TimeSpan.FromSeconds(_dashboardSettings.Store.SensorsRefreshIntervalSeconds), token);
                 }
-                catch (TaskCanceledException) { }
+                catch (OperationCanceledException) { }
                 catch (Exception ex)
                 {
                     if (Log.Instance.IsTraceEnabled)

diff --git a/...nToolkit.WPF/Controls/KeyboardBacklight/Spectrum/SpectrumKeyboardBacklightControl.xaml.cs b/...nToolkit.WPF/Controls/KeyboardBacklight/Spectrum/SpectrumKeyboardBacklightControl.xaml.cs
@@ -386,7 +386,7 @@ private async Task RefreshStateAsync(CancellationToken token)
                 await delay;
             }
         }
-        catch (TaskCanceledException) { }
+        catch (OperationCanceledException) { }
         catch (Exception ex)
         {
             if (Log.Instance.IsTraceEnabled)

diff --git a/LenovoLegionToolkit.WPF/Controls/Packages/PackageControl.xaml.cs b/LenovoLegionToolkit.WPF/Controls/Packages/PackageControl.xaml.cs
@@ -2,7 +2,6 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -119,7 +118,7 @@ private async void DownloadButton_Click(object sender, RoutedEventArgs e)
 
             result = true;
         }
-        catch (TaskCanceledException) { }
+        catch (OperationCanceledException) { }
         catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
         {
             if (Log.Instance.IsTraceEnabled)

diff --git a/LenovoLegionToolkit.WPF/Pages/AutomationPage.xaml.cs b/LenovoLegionToolkit.WPF/Pages/AutomationPage.xaml.cs
@@ -324,7 +324,7 @@ private async Task ChangePipelineIconAsync(AutomationPipelineControl control)
             var icon = await window.SymbolRegularTask;
             control.SetIcon(icon);
         }
-        catch (TaskCanceledException) { }
+        catch (OperationCanceledException) { }
     }
 
     private void DeletePipeline(UIElement control, Panel stackPanel)

diff --git a/LenovoLegionToolkit.WPF/Pages/BatteryPage.xaml.cs b/LenovoLegionToolkit.WPF/Pages/BatteryPage.xaml.cs
@@ -65,7 +65,7 @@ private void Refresh()
 
                     await Task.Delay(TimeSpan.FromSeconds(2), token);
                 }
-                catch (TaskCanceledException) { }
+                catch (OperationCanceledException) { }
                 catch (Exception ex)
                 {
                     if (Log.Instance.IsTraceEnabled)

diff --git a/LenovoLegionToolkit.WPF/Pages/PackagesPage.xaml.cs b/LenovoLegionToolkit.WPF/Pages/PackagesPage.xaml.cs
@@ -171,7 +171,7 @@ private async void DownloadPackagesButton_Click(object sender, RoutedEventArgs e
 
             Reload();
         }
-        catch (TaskCanceledException)
+        catch (OperationCanceledException)
         {
             errorOccurred = true;
         }
@@ -232,7 +232,7 @@ private async void FilterTextBox_TextChanged(object sender, TextChangedEventArgs
 
             Reload();
         }
-        catch (TaskCanceledException) { }
+        catch (OperationCanceledException) { }
     }
 
     private async void OnlyShowUpdatesCheckBox_OnChecked(object sender, RoutedEventArgs e)