Working AoT

microsoft · Sep 5, 2024 · 0e1704b · 0e1704b
1 parent dc1584a
commit 0e1704b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/modules/alwaysontop/AlwaysOnTop/main.cpp b/src/modules/alwaysontop/AlwaysOnTop/main.cpp
@@ -56,8 +56,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
             {
                 Logger::trace(L"PowerToys runner exited.");
             }
-            trace.UpdateState(false);
-            trace.Flush();
 
             Logger::trace(L"Exiting AlwaysOnTop");
             PostThreadMessage(mainThreadId, WM_QUIT, 0, 0);
@@ -72,8 +70,8 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 
     Trace::AlwaysOnTop::UnregisterProvider();
 
-    trace.UpdateState(false);
     trace.Flush();
+    trace.UpdateState(false);
 
     return 0;
 }
diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp
@@ -221,6 +221,10 @@ class AlwaysOnTopModuleInterface : public PowertoyModuleIface
             Trace::AlwaysOnTop::Enable(false);
         }
 
+        // Wait for 1.5 seconds for the process to exit to end process correctly and stop etw tracer
+        WaitForSingleObject(m_hProcess, 1500);
+
+        // If process is still running, terminate it
         if (m_hProcess)
         {
             TerminateProcess(m_hProcess, 0);