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

Kill PowerToys Run process if it is already running (#11407)

Browse Source
This commit is contained in:
Mykhailo Pylyp
2021-05-24 12:05:17 +03:00
committed by GitHub
parent 0be526bd7e
commit d537280454
5 changed files with 88 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/launcher/Microsoft.Launcher/dllmain.cpp
View File

@@ -82,6 +82,27 @@ private:
HANDLE send_telemetry_event;
// Handle a case when a user started standalone PowerToys Run or for some reason the process is leaked
void TerminateRunningInstance()
{
auto exitEvent = CreateEvent(nullptr, false, false, CommonSharedConstants::RUN_EXIT_EVENT);
if (!exitEvent)
{
Logger::warn(L"Failed to create exitEvent. {}", get_last_error_or_default(GetLastError()));
}
else
{
Logger::trace(L"Signaled exitEvent");
if (!SetEvent(exitEvent))
{
Logger::warn(L"Failed to signal exitEvent. {}", get_last_error_or_default(GetLastError()));
}
ResetEvent(exitEvent);
CloseHandle(exitEvent);
}
}
public:
// Constructor
Microsoft_Launcher()
@@ -181,12 +202,12 @@ public:
// Enable the powertoy
virtual void enable()
{
Logger::info("Launcher is enabling");
Logger::info("Microsoft_Launcher::enable()");
ResetEvent(m_hEvent);
ResetEvent(send_telemetry_event);
unsigned long powertoys_pid = GetCurrentProcessId();
TerminateRunningInstance();
if (!is_process_elevated(false))
{
Logger::trace("Starting PowerToys Run from not elevated process");