Fix crash during auto-update (#280)

Tyrrrz · Apr 8, 2024 · dcb0680 · dcb0680
1 parent bf0d9c1
commit dcb0680
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/LightBulb/App.axaml.cs b/LightBulb/App.axaml.cs
@@ -25,17 +25,18 @@ public App()
     {
         var services = new ServiceCollection();
 
+        // Framework
+        services.AddSingleton<DialogManager>();
+        services.AddSingleton<ViewManager>();
+        services.AddSingleton<ViewModelManager>();
+
         // Services
         services.AddSingleton<ExternalApplicationService>();
         services.AddSingleton<GammaService>();
         services.AddSingleton<HotKeyService>();
         services.AddSingleton<SettingsService>();
         services.AddSingleton<UpdateService>();
 
-        // View model framework
-        services.AddSingleton<DialogManager>();
-        services.AddSingleton<ViewModelManager>();
-
         // View models
         services.AddTransient<MainViewModel>();
         services.AddTransient<DashboardViewModel>();
@@ -47,9 +48,6 @@ public App()
         services.AddTransient<SettingsTabViewModelBase, HotKeySettingsTabViewModel>();
         services.AddTransient<SettingsTabViewModelBase, LocationSettingsTabViewModel>();
 
-        // View framework
-        services.AddSingleton<ViewManager>();
-
         _services = services.BuildServiceProvider(true);
         _mainViewModel = _services.GetRequiredService<ViewModelManager>().CreateMainViewModel();
     }
@@ -69,12 +67,6 @@ public override void OnFrameworkInitializationCompleted()
             Color.Parse("#343838"),
             Color.Parse("#F9A825")
         );
-
-        // Finalize pending updates (and restart) before launching the app
-        _services.GetRequiredService<UpdateService>().FinalizePendingUpdates();
-
-        // Load settings
-        _services.GetRequiredService<SettingsService>().Load();
     }
 
     private void ShowMainWindow()
@@ -126,7 +118,7 @@ private void DisableTemporarily1MinuteMenuItem_OnClick(object? sender, EventArgs
         _mainViewModel.Dashboard.DisableTemporarilyCommand.Execute(TimeSpan.FromMinutes(1));
 
     private void ExitMenuItem_OnClick(object? sender, EventArgs args) =>
-        ApplicationLifetime?.Shutdown();
+        ApplicationLifetime?.TryShutdown();
 
     public void Dispose() => _services.Dispose();
 }
diff --git a/LightBulb/LightBulb.csproj b/LightBulb/LightBulb.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Material.Avalonia" Version="3.5.0" />
     <PackageReference Include="Material.Icons.Avalonia" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Onova" Version="2.6.10" />
+    <PackageReference Include="Onova" Version="2.6.11" />
   </ItemGroup>
 
 </Project>
diff --git a/LightBulb/Services/UpdateService.cs b/LightBulb/Services/UpdateService.cs
@@ -57,7 +57,9 @@ public void FinalizePendingUpdates()
                 return;
 
             _updateManager.LaunchUpdater(lastPreparedUpdate);
-            Application.Current?.ApplicationLifetime?.Shutdown(2);
+
+            if (Application.Current?.ApplicationLifetime?.TryShutdown(2) != true)
+                Environment.Exit(2);
         }
         catch (UpdaterAlreadyLaunchedException)
         {

diff --git a/LightBulb/Utils/Extensions/AvaloniaExtensions.cs b/LightBulb/Utils/Extensions/AvaloniaExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
 namespace LightBulb.Utils.Extensions;
@@ -11,20 +10,19 @@ lifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime
             ? desktopLifetime.MainWindow
             : null;
 
-    public static void Shutdown(this IApplicationLifetime lifetime, int exitCode = 0)
+    public static bool TryShutdown(this IApplicationLifetime lifetime, int exitCode = 0)
     {
         if (lifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
         {
-            desktopLifetime.TryShutdown(exitCode);
-            return;
+            return desktopLifetime.TryShutdown(exitCode);
         }
 
         if (lifetime is IControlledApplicationLifetime controlledLifetime)
         {
             controlledLifetime.Shutdown(exitCode);
-            return;
+            return true;
         }
 
-        Environment.Exit(exitCode);
+        return false;
     }
 }
diff --git a/LightBulb/ViewModels/MainViewModel.cs b/LightBulb/ViewModels/MainViewModel.cs
@@ -104,6 +104,12 @@ Click LEARN MORE to find ways that you can help.
     [RelayCommand]
     private async Task InitializeAsync()
     {
+        // Finalize pending updates (and restart if necessary)
+        updateService.FinalizePendingUpdates();
+
+        // Load settings
+        settingsService.Load();
+
         await ShowGammaRangePromptAsync();
         await ShowFirstTimeExperienceMessageAsync();
         await ShowUkraineSupportMessageAsync();