From bb7d4bdc09d0b52a65b8cf3b5ae629f385fc8011 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 2 Feb 2021 16:56:57 -0600
Subject: Clean up synchronization between the engine and the BA.

---
 src/engine/engine.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/engine/engine.cpp')

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 9eee7fde..2c6bad03 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -330,7 +330,6 @@ static HRESULT InitializeEngineState(
 
     pEngineState->automaticUpdates = BURN_AU_PAUSE_ACTION_IFELEVATED;
     pEngineState->dwElevatedLoggingTlsId = TLS_OUT_OF_INDEXES;
-    ::InitializeCriticalSection(&pEngineState->csActive);
     ::InitializeCriticalSection(&pEngineState->userExperience.csEngineActive);
     PipeConnectionInitialize(&pEngineState->companionConnection);
     PipeConnectionInitialize(&pEngineState->embeddedConnection);
@@ -418,8 +417,6 @@ static void UninitializeEngineState(
         ::TlsFree(pEngineState->dwElevatedLoggingTlsId);
     }
 
-    ::DeleteCriticalSection(&pEngineState->csActive);
-
     // clear struct
     memset(pEngineState, 0, sizeof(BURN_ENGINE_STATE));
 }
@@ -805,6 +802,8 @@ static HRESULT ProcessMessage(
 {
     HRESULT hr = S_OK;
 
+    UserExperienceActivateEngine(&pEngineState->userExperience);
+
     switch (pmsg->message)
     {
     case WM_BURN_DETECT:
@@ -832,6 +831,8 @@ static HRESULT ProcessMessage(
         break;
     }
 
+    UserExperienceDeactivateEngine(&pEngineState->userExperience);
+
     return hr;
 }
 
-- 
cgit v1.2.3-55-g6feb