Merge 4521e022aa into b556adaa09

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -144,16 +144,10 @@ public sealed class AppManager
         AppEvents.ShutdownRequested.Publish(byUser);
     }
 
-    public async Task<bool> RebootAsAdmin()
+    public async Task RebootAsAdmin()
     {
-        var started = ProcUtils.RebootAsAdmin();
-        if (!started)
-        {
-            return false;
-        }
-
+        ProcUtils.RebootAsAdmin();
         await AppManager.Instance.AppExitAsync(true);
-        return true;
     }
 
     #endregion App

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -469,21 +469,18 @@ public class StatusBarViewModel : MyReactiveObject
             return;
         }
 
-        var allowEnableTun = AllowEnableTun();
-        if (PrepareTunConfigForPrivilegeEscalation(_config, EnableTun, allowEnableTun, Utils.IsWindows()))
+        _config.TunModeItem.EnableTun = EnableTun;
+
+        if (EnableTun && AllowEnableTun() == false)
         {
-            await ConfigHandler.SaveConfig(_config);
-            if (!await AppManager.Instance.RebootAsAdmin())
+            // When running as a non-administrator, reboot to administrator mode
+            if (Utils.IsWindows())
             {
                 _config.TunModeItem.EnableTun = false;
-                EnableTun = false;
-                await ConfigHandler.SaveConfig(_config);
-                NoticeManager.Instance.SendMessageEx(ResUI.OperationFailed);
-            }
+                await AppManager.Instance.RebootAsAdmin();
                 return;
             }
-
-        if (EnableTun && !allowEnableTun)
+            else
             {
                 bool? passwordResult = await _updateView?.Invoke(EViewAction.PasswordInput, null);
                 if (passwordResult == false)
@@ -492,17 +489,12 @@ public class StatusBarViewModel : MyReactiveObject
                     return;
                 }
             }
+        }
 
         await ConfigHandler.SaveConfig(_config);
         AppEvents.ReloadRequested.Publish();
     }
 
-    private static bool PrepareTunConfigForPrivilegeEscalation(Config config, bool enableTun, bool allowEnableTun, bool isWindows)
-    {
-        config.TunModeItem.EnableTun = enableTun;
-        return enableTun && !allowEnableTun && isWindows;
-    }
-
     private bool AllowEnableTun()
     {
         if (Utils.IsWindows())