Skip to content

Wait for PowerToys exit before launching installer #46973

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

Open
crutkas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Wait for PowerToys exit before launching installer #46973

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions src/Update/PowerToys.Update.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <common/utils/resources.h>
#include <common/utils/timeutil.h>

#include <wil/resource.h>

#include <common/SettingsAPI/settings_helpers.h>

#include <common/logger/logger.h>
Expand Down Expand Up @@ -116,7 +118,22 @@ bool InstallNewVersionStage1(fs::path installer)

if (pt_main_window != nullptr)
{
// Get the process that owns the tray window so we can wait for it to exit
DWORD ptProcessId = 0;
GetWindowThreadProcessId(pt_main_window, &ptProcessId);

SendMessageW(pt_main_window, WM_CLOSE, 0, 0);

// Wait for PT to actually exit before launching installer.
// Without this, the installer may find PT files locked.
if (ptProcessId != 0)
{
wil::unique_handle ptProcess{ OpenProcess(SYNCHRONIZE, FALSE, ptProcessId) };
if (ptProcess)
{
WaitForSingleObject(ptProcess.get(), 10000); // 10 second timeout
}
}
}

std::wstring arguments{ UPDATE_NOW_LAUNCH_STAGE2 };
Expand Down
Loading