Revert "Don't use async void"

Tyrrrz · Sep 6, 2023 · 3935a18 · 3935a18
1 parent 66509d9
commit 3935a18
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/LightBulb/ViewModels/Components/Settings/LocationSettingsTabViewModel.cs b/LightBulb/ViewModels/Components/Settings/LocationSettingsTabViewModel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using LightBulb.Core;
 using LightBulb.Services;
 using Stylet;
@@ -48,9 +47,9 @@ public LocationSettingsTabViewModel(SettingsService settingsService)
         );
     }
 
-    public bool CanAutoDetectLocationAsync => !IsBusy;
+    public bool CanAutoDetectLocation => !IsBusy;
 
-    public async Task AutoDetectLocationAsync()
+    public async void AutoDetectLocation()
     {
         IsBusy = true;
         IsLocationError = false;
@@ -69,12 +68,12 @@ public async Task AutoDetectLocationAsync()
         }
     }
 
-    public bool CanSetLocationAsync =>
+    public bool CanSetLocation =>
         !IsBusy
         && !string.IsNullOrWhiteSpace(LocationQuery)
         && LocationQuery != Location?.ToString();
 
-    public async Task SetLocationAsync()
+    public async void SetLocation()
     {
         if (string.IsNullOrWhiteSpace(LocationQuery))
             return;

diff --git a/LightBulb/ViewModels/RootViewModel.cs b/LightBulb/ViewModels/RootViewModel.cs
@@ -137,7 +137,7 @@ public async void OnViewFullyLoaded()
         await ShowUkraineSupportMessageAsync();
     }
 
-    public async Task ShowSettingsAsync() =>
+    public async void ShowSettings() =>
         await _dialogManager.ShowDialogAsync(_viewModelFactory.CreateSettingsViewModel());
 
     public void ShowAbout() => ProcessEx.StartShellExecute(App.GitHubProjectUrl);

diff --git a/LightBulb/Views/Components/Settings/LocationSettingsTabView.xaml b/LightBulb/Views/Components/Settings/LocationSettingsTabView.xaml
@@ -93,7 +93,7 @@
                     Margin="16,0,0,0"
                     Padding="4"
                     VerticalAlignment="Center"
-                    Command="{s:Action AutoDetectLocationAsync}"
+                    Command="{s:Action AutoDetectLocation}"
                     Style="{DynamicResource MaterialDesignFlatButton}"
                     ToolTip="Try to detect location automatically based on your IP">
                     <materialDesign:PackIcon
@@ -134,7 +134,7 @@
                     Margin="0,0,16,0"
                     Padding="4"
                     VerticalAlignment="Center"
-                    Command="{s:Action SetLocationAsync}"
+                    Command="{s:Action SetLocation}"
                     IsDefault="True"
                     Style="{DynamicResource MaterialDesignFlatButton}"
                     ToolTip="Set location">

diff --git a/LightBulb/Views/RootView.xaml b/LightBulb/Views/RootView.xaml
@@ -300,7 +300,7 @@
                     <!--  Settings  -->
                     <Button
                         Margin="8"
-                        Command="{s:Action ShowSettingsAsync}"
+                        Command="{s:Action ShowSettings}"
                         Style="{DynamicResource MaterialDesignFlatButton}"
                         ToolTip="Open settings">
                         <StackPanel Orientation="Horizontal">