Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fallback to run as admin after install, if running PT as user not possible #16089

Merged
merged 5 commits into from
Feb 8, 2022
Merged

Fallback to run as admin after install, if running PT as user not possible #16089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d4d50d
Fallback to run as admin, if running PT as user not possible
stefansjfw Feb 4, 2022
dbd5e57
Update condition - address PR comment
stefansjfw Feb 4, 2022
28bef92
Update condition #2 - address PR comment
stefansjfw Feb 4, 2022
3870e04
Update condition #3 - address PR comment
stefansjfw Feb 4, 2022
db6baf9
Revert method name & unify var namings
stefansjfw Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions src/runner/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,15 +386,17 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
apply_general_settings(general_settings, false);
int rvalue = 0;
const bool elevated = is_process_elevated();
const bool with_dont_elevate_arg = cmdLine.find("--dont-elevate") != std::string::npos;
const bool run_elevated_setting = general_settings.GetNamedBoolean(L"run_elevated", false);

if (elevated && cmdLine.find("--dont-elevate") != std::string::npos &&
general_settings.GetNamedBoolean(L"run_elevated", false) == false) {
if (elevated && with_dont_elevate_arg && !run_elevated_setting)

{
schedule_restart_as_non_elevated();
result = 0;
}
else if ((elevated ||
general_settings.GetNamedBoolean(L"run_elevated", false) == false ||
cmdLine.find("--dont-elevate") != std::string::npos))
else if (elevated || !run_elevated_setting || with_dont_elevate_arg)

{
result = runner(elevated, open_settings, settings_window, openOobe);

Expand Down Expand Up @@ -423,14 +425,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine

if (is_restart_scheduled())
{
if (restart_if_scheduled() == false)
{
auto text = is_process_elevated() ? GET_RESOURCE_STRING(IDS_COULDNOT_RESTART_NONELEVATED) :
GET_RESOURCE_STRING(IDS_COULDNOT_RESTART_ELEVATED);
MessageBoxW(nullptr, text.c_str(), GET_RESOURCE_STRING(IDS_ERROR).c_str(), MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
if (!restart_if_scheduled())

{
Logger::warn("Scheduled restart failed. Trying restart as admin as fallback...");
restart_same_elevation();
result = -1;
}
}
stop_tray_icon();
Expand Down
2 changes: 1 addition & 1 deletion src/runner/restart_elevated.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ bool restart_same_elevation()
constexpr DWORD exe_path_size = 0xFFFF;
auto exe_path = std::make_unique<wchar_t[]>(exe_path_size);
GetModuleFileNameW(nullptr, exe_path.get(), exe_path_size);
return run_same_elevation(exe_path.get(), L"--dont-elevate", nullptr);
return run_same_elevation(exe_path.get(), L"", nullptr);
}