Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 04:37:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't wait for ColorPicker.exe to close (#5866)

Browse Source
This commit is contained in:
Ivan Stošić
2020-08-11 17:06:28 +02:00
committed by GitHub
parent 145347f7ae
commit 83de1686c0
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/colorPicker/ColorPicker/dllmain.cpp
View File

@@ -132,7 +132,7 @@ public:
{ {
if (m_enabled) if (m_enabled)
{ {
terminateProcess(); TerminateProcess(m_hProcess, 1);
} }
m_enabled = false; m_enabled = false;
@@ -142,28 +142,6 @@ public:
{ {
return m_enabled; return m_enabled;
} }
static BOOL CALLBACK requestMainWindowClose(HWND nextWindow, LPARAM closePid)
{
DWORD windowPid;
GetWindowThreadProcessId(nextWindow, &windowPid);
if (windowPid == (DWORD)closePid)
::PostMessage(nextWindow, WM_CLOSE, 0, 0);
return true;
}
void terminateProcess()
{
DWORD processID = GetProcessId(m_hProcess);
EnumWindows(&requestMainWindowClose, processID);
const DWORD result = WaitForSingleObject(m_hProcess, MAX_WAIT_MILLISEC);
if (result == WAIT_TIMEOUT)
{
TerminateProcess(m_hProcess, 1);
}
}
}; };
extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()