3 files changed, 5 insertions, 5 deletions

diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index 90bbc8f6..bfd979de 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -447,9 +447,6 @@ extern "C" HRESULT CorePlan(
     BURN_PACKAGE* pForwardCompatibleBundlePackage = NULL;
     BOOL fContinuePlanning = TRUE; // assume we won't skip planning due to dependencies.
 
-    hr = PlanSetVariables(action, &pEngineState->variables);
-    ExitOnFailure(hr, "Failed to update action.");
-
     LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action));
 
     fPlanBegan = TRUE;
@@ -469,6 +466,9 @@ extern "C" HRESULT CorePlan(
     pEngineState->fPlanned = FALSE;
     PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads);
 
+    hr = PlanSetVariables(action, &pEngineState->variables);
+    ExitOnFailure(hr, "Failed to update action.");
+
     // Remember the overall action state in the plan since it shapes the changes
     // we make everywhere.
     pEngineState->plan.action = action;
diff --git a/src/burn/engine/splashscreen.cpp b/src/burn/engine/splashscreen.cpp
index ff61996f..7ba4e630 100644
--- a/src/burn/engine/splashscreen.cpp
+++ b/src/burn/engine/splashscreen.cpp
@@ -170,7 +170,7 @@ static DWORD WINAPI ThreadProc(
     SPLASHSCREEN_INFO splashScreenInfo = { };
 
     WNDCLASSW wc = { };
-    BOOL fRegistered = TRUE;
+    BOOL fRegistered = FALSE;
 
     BOOL fRet = FALSE;
     MSG msg = { };
diff --git a/src/burn/engine/uithread.cpp b/src/burn/engine/uithread.cpp
index cdd8613c..fe1c21b8 100644
--- a/src/burn/engine/uithread.cpp
+++ b/src/burn/engine/uithread.cpp
@@ -98,7 +98,7 @@ static DWORD WINAPI ThreadProc(
     UITHREAD_INFO info = { };
 
     WNDCLASSW wc = { };
-    BOOL fRegistered = TRUE;
+    BOOL fRegistered = FALSE;
     HWND hWnd = NULL;
 
     BOOL fRet = FALSE;