From 164c4ffd01b5f6e4847e9dd79e1b7ee9dec1300d Mon Sep 17 00:00:00 2001 From: Robert Ludewig Date: Fri, 14 Feb 2020 17:42:19 +0100 Subject: [PATCH 1/2] Remove useless awaits --- src/Nito.Mvvm.Async/AsyncCommand.cs | 1 - src/Nito.Mvvm.Async/CustomAsyncCommand.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Nito.Mvvm.Async/AsyncCommand.cs b/src/Nito.Mvvm.Async/AsyncCommand.cs index 1553d14..3b87183 100644 --- a/src/Nito.Mvvm.Async/AsyncCommand.cs +++ b/src/Nito.Mvvm.Async/AsyncCommand.cs @@ -88,7 +88,6 @@ public override async Task ExecuteAsync(object parameter) await Execution.TaskCompleted; OnCanExecuteChanged(); PropertyChanged?.Invoke(this, PropertyChangedEventArgsCache.Instance.Get("IsExecuting")); - await Execution.Task; } /// diff --git a/src/Nito.Mvvm.Async/CustomAsyncCommand.cs b/src/Nito.Mvvm.Async/CustomAsyncCommand.cs index 67a6840..c3eb74a 100644 --- a/src/Nito.Mvvm.Async/CustomAsyncCommand.cs +++ b/src/Nito.Mvvm.Async/CustomAsyncCommand.cs @@ -96,7 +96,6 @@ public override async Task ExecuteAsync(object parameter) tcs.SetResult(null); await Execution.TaskCompleted; PropertyChanged?.Invoke(this, PropertyChangedEventArgsCache.Instance.Get("IsExecuting")); - await Execution.Task; } /// From c6be9460c83391fc8fcfd07b9366145d4e682d16 Mon Sep 17 00:00:00 2001 From: Robert Ludewig Date: Fri, 14 Feb 2020 18:29:06 +0100 Subject: [PATCH 2/2] Remove useless catch block --- src/Nito.Mvvm.Async/CancelCommand.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Nito.Mvvm.Async/CancelCommand.cs b/src/Nito.Mvvm.Async/CancelCommand.cs index af86867..b83842b 100644 --- a/src/Nito.Mvvm.Async/CancelCommand.cs +++ b/src/Nito.Mvvm.Async/CancelCommand.cs @@ -118,14 +118,7 @@ public Func Wrap(Func executeAsyn { using (StartOperation()) { - try - { - await executeAsync(parameter, _context.Token); - } - catch (OperationCanceledException) - { - // We cannot use `when (ex.CancellationToken == cancellationToken)` on the catch block because the user delegate may be cancelled by a linked CancellationToken. - } + await executeAsync(parameter, _context.Token); } }; }