pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-09-29 18:12:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ProcessStart RebootAsAdmin

Browse Source
This commit is contained in:
2dust
2025-01-03 20:56:51 +08:00
parent 3db1dd7bbb
commit c0d27504ac
15 changed files with 93 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+8 -33
View File
@@ -1,9 +1,7 @@
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using Splat;
using System.Diagnostics;
using System.Reactive;
using System.Reactive.Linq;
namespace ServiceLib.ViewModels
{
@@ -319,20 +317,9 @@ namespace ServiceLib.ViewModels
return;
}
Process process = new()
var id = ProcUtils.ProcessStart(fileName, arg, Utils.StartupPath());
if (id > 0)
{
StartInfo = new ProcessStartInfo
{
UseShellExecute = true,
FileName = fileName,
Arguments = arg.AppendQuotes(),
WorkingDirectory = Utils.StartupPath()
}
};
process.Start();
if (process.Id > 0)
{
await MyAppExitAsync(false);
await MyAppExitAsync(false);
}
}
@@ -513,22 +500,10 @@ namespace ServiceLib.ViewModels
}
}
public async Task RebootAsAdmin(bool blAdmin = true)
public async Task RebootAsAdmin()
{
try
{
ProcessStartInfo startInfo = new()
{
UseShellExecute = true,
Arguments = Global.RebootAs,
WorkingDirectory = Utils.StartupPath(),
FileName = Utils.GetExePath().AppendQuotes(),
Verb = blAdmin ? "runas" : null,
};
Process.Start(startInfo);
await MyAppExitAsync(false);
}
catch { }
ProcUtils.RebootAsAdmin();
await MyAppExitAsync(false);
}
private async Task ClearServerStatistics()
@@ -542,15 +517,15 @@ namespace ServiceLib.ViewModels
var path = Utils.StartupPath();
if (Utils.IsWindows())
{
Utils.ProcessStart(path);
ProcUtils.ProcessStart(path);
}
else if (Utils.IsLinux())
{
Utils.ProcessStart("nautilus", path);
ProcUtils.ProcessStart("nautilus", path);
}
else if (Utils.IsOSX())
{
Utils.ProcessStart("open", path);
ProcUtils.ProcessStart("open", path);
}
}