add autostart removal on uninstallation

dragonfruitnetwork · Nov 20, 2024 · f462d12 · f462d12
1 parent c39da53
commit f462d12
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/DragonFruit.OnionFruit.Windows/Program.cs b/DragonFruit.OnionFruit.Windows/Program.cs
@@ -47,7 +47,8 @@ public static class Program
     public static void Main(string[] args)
     {
         HandleSecondInstance();
-        VelopackApp.Build().Run();
+
+        VelopackApp.Build().WithBeforeUninstallFastCallback(_ => PerformRemovalCleanup()).Run();
 
         // FluentAvalonia needs Windows 10.0.14393.0 (Anniversary Update) or later
         // see https://github.com/amwx/FluentAvalonia/issues/212
@@ -208,4 +209,12 @@ private static void PerformShutdown(object sender, UnhandledExceptionEventArgs e
         // shutdown any ongoing session
         _host?.Services.GetService<TorSession>().StopSession().AsTask().Wait();
     }
+
+    private static void PerformRemovalCleanup()
+    {
+        using (var startupManager = new StartupLaunchService(null, null))
+        {
+            startupManager.SetStartupState(false);
+        }
+    }
 }
diff --git a/DragonFruit.OnionFruit.Windows/StartupLaunchService.cs b/DragonFruit.OnionFruit.Windows/StartupLaunchService.cs
@@ -38,7 +38,7 @@ public StartupLaunchService(IOnionFruitUpdater updater, string[] launchArgs)
                 _startupCollectionKey = null;
             }
 
-            InstanceLaunchedByStartupService = launchArgs.Any(x => x.Equals(StartupAppArgs, StringComparison.OrdinalIgnoreCase));
+            InstanceLaunchedByStartupService = launchArgs?.Any(x => x.Equals(StartupAppArgs, StringComparison.OrdinalIgnoreCase)) == true;
         }
 
         public bool InstanceLaunchedByStartupService { get; }
@@ -71,7 +71,7 @@ public StartupLaunchState SetStartupState(bool enabled)
         private StartupLaunchState GetStartupStateImpl()
         {
 #if !DEBUG
-            if (!_updater.IsInstalled)
+            if (_updater?.IsInstalled != true)
             {
                 return StartupLaunchState.Blocked;
             }