[AOT] Fix CPU consumption (#19653)

Wait until object is signaled instead
microsoft · Jul 28, 2022 · bdddea9 · bdddea9
1 parent 9fb9c6a
commit bdddea9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.cpp b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.cpp
@@ -54,12 +54,14 @@ AlwaysOnTop::AlwaysOnTop(bool useLLKH) :
 
 AlwaysOnTop::~AlwaysOnTop()
 {
+ m_running = false;
+
  if (m_hPinEvent)
  {
+ // Needed to unblock MsgWaitForMultipleObjects one last time
+ SetEvent(m_hPinEvent);
  CloseHandle(m_hPinEvent);
  }
-
- m_running = false;
  m_thread.join();
 
  CleanUp();
@@ -280,7 +282,11 @@ void AlwaysOnTop::RegisterLLKH()
  MSG msg;
  while (m_running)
  {
- DWORD dwEvt = MsgWaitForMultipleObjects(1, &m_hPinEvent, false, 0, QS_ALLINPUT);
+ DWORD dwEvt = MsgWaitForMultipleObjects(1, &m_hPinEvent, false, INFINITE, QS_ALLINPUT);
+ if (!m_running)
+ {
+ break;
+ }
  switch (dwEvt)
  {
  case WAIT_OBJECT_0: