mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-01 09:59:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PTRun]Avoid starting two instances from runner (#14868)

Browse Source 
* [PTRun]Avoid starting two instances from runner

* Set m_enabled later
This commit is contained in:
Jaime Bernardo 2021-12-09 11:05:31 +00:00 committed by GitHub
parent dfa139b72f
commit 2ba1dcf03a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
#include <common/utils/winapi_error.h>
#include <filesystem>
#include <mutex>
namespace
{
@ -60,6 +61,8 @@ private:
// Load initial settings from the persisted values.
void init_settings();
bool processStarting = false;
std::mutex processStartingMutex;
bool processStarted = false;
//contains the name of the powerToys
@ -204,8 +207,25 @@ public:
// Enable the powertoy
virtual void enable()
{
Logger::info("Microsoft_Launcher::enable()");
m_enabled = true;
Logger::info("Microsoft_Launcher::enable() begin");
// This synchronization code is here since we've seen logs of this function being entered twice in the same process/thread pair.
// The theory here is that the call to ShellExecuteExW might be enabling some context switching that allows the low level keyboard hook to be run.
// Ref: https://github.com/microsoft/PowerToys/issues/12908#issuecomment-986995633
// We want only one instance to be started at the same time.
processStartingMutex.lock();
if (processStarting)
{
processStartingMutex.unlock();
Logger::warn(L"Two PowerToys Run processes were trying to get started at the same time.");
return;
}
else
{
processStarting = true;
processStartingMutex.unlock();
}
ResetEvent(m_hCentralizedKeyboardHookEvent);
ResetEvent(send_telemetry_event);
@ -264,6 +284,9 @@ public:
}
}
}
processStarting = false;
m_enabled = true;
Logger::info("Microsoft_Launcher::enable() end");
}
// Disable the powertoy