Fix admin launch and settings visibility

This commit is contained in:
Ray Berezowski
2026-08-26 22:30:00 -04:00
parent 1601da8155
commit c5fd18e6d3
3 changed files with 111 additions and 78 deletions

View File

@@ -276,18 +276,20 @@ public sealed class LauncherController : IDisposable
}
string target = Environment.ExpandEnvironmentVariables(item.Target);
bool runAsAdmin = item.RunAsAdmin && CanRunAsAdmin(item.Type);
string launchTarget = runAsAdmin ? ResolveExecutableTarget(target) : target;
try
{
ProcessStartInfo startInfo = new()
{
FileName = target,
FileName = launchTarget,
Arguments = item.Arguments ?? "",
UseShellExecute = true,
WorkingDirectory = Directory.Exists(target) ? target : ConfigService.AppFolder
};
if (item.RunAsAdmin && CanRunAsAdmin(item.Type))
if (runAsAdmin)
{
startInfo.Verb = "runas";
}
@@ -306,4 +308,32 @@ public sealed class LauncherController : IDisposable
{
return itemType is LauncherItemType.App or LauncherItemType.File;
}
private static string ResolveExecutableTarget(string target)
{
if (Path.IsPathRooted(target) || Path.GetDirectoryName(target) is { Length: > 0 })
{
return target;
}
string[] searchFolders =
[
Environment.CurrentDirectory,
Environment.GetFolderPath(Environment.SpecialFolder.Windows),
Environment.GetFolderPath(Environment.SpecialFolder.System),
.. (Environment.GetEnvironmentVariable("PATH") ?? "")
.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
];
foreach (string folder in searchFolders.Where(Directory.Exists).Distinct(StringComparer.OrdinalIgnoreCase))
{
string candidate = Path.Combine(folder, target);
if (File.Exists(candidate))
{
return candidate;
}
}
return target;
}
}