启动时自动以管理员权限重启选项无法正常启动 #29

Author: nahida-mouo

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Bootstrap.cs

@@ -7,7 +7,6 @@
 using Snap.Hutao.Remastered.Core.Security.Principal;
 using Snap.Hutao.Remastered.Factory.Process;
 using Snap.Hutao.Remastered.Service;
-using Snap.Hutao.Remastered.Service.Plugin;
 using Snap.Hutao.Remastered.Win32;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
@@ -35,6 +34,13 @@ public static void UseNamedPipeRedirection()
     [STAThread]
     private static void Main(string[] args)
     {
+        // Check if we should restart as administrator
+        if (ShouldRestartAsAdmin())
+        {
+            RestartAsAdministrator();
+            return;
+        }
+
         if (Mutex.TryOpenExisting(LockName, out _))
         {
             return;
@@ -68,17 +74,10 @@ private static void Main(string[] args)
             ComWrappersSupport.InitializeComWrappers();
 
             // By adding the using statement, we can dispose the injected services when closing
-            using (ServiceProvider serviceProvider = DependencyInjection.Initialize())
+            using (ServiceProvider serviceProvider = DependencyInjection.Initialize(true))
             {
                 Thread.CurrentThread.Name = "Snap Hutao Remastered Application Main Thread";
 
-                // Check if we should restart as administrator
-                if (ShouldRestartAsAdmin(serviceProvider))
-                {
-                    RestartAsAdministrator();
-                    return;
-                }
-
                 // If you hit a COMException REGDB_E_CLASSNOTREG (0x80040154) during debugging
                 // You can delete bin and obj folder and then rebuild.
                 // In a Desktop app this runs a message pump publicly,
@@ -112,11 +111,11 @@ private static bool IsRunningAsAdministrator()
         return principal.IsInRole(WindowsBuiltInRole.Administrator);
     }
 
-    private static bool ShouldRestartAsAdmin(IServiceProvider serviceProvider)
+    private static bool ShouldRestartAsAdmin()
     {
         try
         {
-            AppOptions appOptions = serviceProvider.GetRequiredService<AppOptions>();
+            AppOptions appOptions = DependencyInjection.Initialize().GetRequiredService<AppOptions>();
             return !IsRunningAsAdministrator() && appOptions.AutoRestartAsAdmin.Value;
         }
         catch (Exception ex)

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Core/DependencyInjection/DependencyInjection.cs

@@ -16,7 +16,7 @@ namespace Snap.Hutao.Remastered.Core.DependencyInjection;
 
 public static class DependencyInjection
 {
-    public static ServiceProvider Initialize()
+    public static ServiceProvider Initialize(bool isDefault = false)
     {
         IServiceCollection services = new ServiceCollection()
 
@@ -47,7 +47,10 @@ public static ServiceProvider Initialize()
 
         ServiceProvider serviceProvider = services.BuildServiceProvider(new ServiceProviderOptions { ValidateOnBuild = true, ValidateScopes = true });
 
-        Ioc.Default.ConfigureServices(serviceProvider);
+        if (isDefault)
+        {
+            Ioc.Default.ConfigureServices(serviceProvider);
+        }
 
         serviceProvider.InitializeCulture();
         serviceProvider.InitializeNotification();