Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 11:17:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

If process elevated and --dont-elevate arg - run non elevated (#15920)

Browse Source
This commit is contained in:
Stefan Markovic
2022-02-02 11:23:40 +01:00
committed by GitHub
parent 51a43d58de
commit 0fc69ca222
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/PowerToysSetup/Product.wxs
View File

@@ -148,7 +148,7 @@
Impersonate="yes" Impersonate="yes"
Return="asyncNoWait" Return="asyncNoWait"
FileKey="PowerToys.exe" FileKey="PowerToys.exe"
ExeCommand="" /> ExeCommand="--dont-elevate" />
<CustomAction <CustomAction
Id="TerminateProcesses" Id="TerminateProcesses"

8
src/runner/main.cpp
View File

@@ -386,7 +386,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
apply_general_settings(general_settings, false); apply_general_settings(general_settings, false);
int rvalue = 0; int rvalue = 0;
const bool elevated = is_process_elevated(); const bool elevated = is_process_elevated();
if ((elevated ||
if (elevated && cmdLine.find("--dont-elevate") != std::string::npos &&
general_settings.GetNamedBoolean(L"run_elevated", false) == false) {
schedule_restart_as_non_elevated();
result = 0;
}
else if ((elevated ||
general_settings.GetNamedBoolean(L"run_elevated", false) == false || general_settings.GetNamedBoolean(L"run_elevated", false) == false ||
cmdLine.find("--dont-elevate") != std::string::npos)) cmdLine.find("--dont-elevate") != std::string::npos))
{ {