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

runner: don't try to restart explorer (#5763)

Browse Source
This commit is contained in:
Andrey Nekrasov
2020-08-07 15:26:34 +03:00
committed by GitHub
parent bd80bb6bb3
commit 63c36d0dbf
1 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/runner/main.cpp
View File

@@ -35,15 +35,12 @@
extern "C" IMAGE_DOS_HEADER __ImageBase;
// Window Explorer process name should not be localized.
const wchar_t EXPLORER_PROCESS_NAME[] = L"explorer.exe";
namespace localized_strings
{
const wchar_t MSI_VERSION_IS_ALREADY_RUNNING[] = L"An older version of PowerToys is already running.";
const wchar_t DOWNLOAD_UPDATE_ERROR[] = L"Couldn't download PowerToys update! Please report the issue on Github.";
const wchar_t OLDER_MSIX_UNINSTALLED[] = L"An older MSIX version of PowerToys was uninstalled.";
const wchar_t PT_UPDATE_MESSAGE_BOX_TEXT[] = L"PowerToys was updated and some components require Windows Explorer to restart. Do you want to restart Windows Explorer now?";
const wchar_t PT_UPDATE_MESSAGE_BOX_TEXT[] = L"PowerToys was updated successfully!";
}
namespace
@@ -260,43 +257,6 @@ toast_notification_handler_result toast_notification_handler(const std::wstring_
}
}
void RequestExplorerRestart()
{
if (MessageBoxW(nullptr,
localized_strings::PT_UPDATE_MESSAGE_BOX_TEXT,
L"PowerToys",
MB_ICONINFORMATION | MB_YESNO | MB_DEFBUTTON1) != IDYES)
{
return;
}
std::thread{ [] {
RestartProcess(EXPLORER_PROCESS_NAME);
constexpr size_t max_checks = 10;
for (size_t i = 0; i < max_checks; ++i)
{
Sleep(1000);
const bool explorerStarted = !getProcessHandlesByName(L"explorer.exe", {}).empty();
if (explorerStarted)
{
return;
}
}
// Timeout - restart explorer manually
SHELLEXECUTEINFOW sei{ sizeof(sei) };
sei.fMask = { SEE_MASK_NOASYNC | SEE_MASK_FLAG_NO_UI | SEE_MASK_NO_CONSOLE | SEE_MASK_NOCLOSEPROCESS };
sei.lpFile = L"cmd";
sei.lpParameters = L"/c explorer.exe";
sei.nShow = SW_HIDE;
ShellExecuteExW(&sei);
// Let cmd launch explorer, then terminate it
Sleep(1000);
TerminateProcess(sei.hProcess, 0);
CloseHandle(sei.hProcess);
} }.detach();
}
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
{
winrt::init_apartment();
@@ -332,7 +292,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
return 0;
}
case SpecialMode::ReportSuccessfulUpdate:
RequestExplorerRestart();
notifications::show_toast(localized_strings::PT_UPDATE_MESSAGE_BOX_TEXT, L"PowerToys");
break;
case SpecialMode::None: