From 6ea5dd2eb92df86ca5ed0332daa1feb7c778a0b3 Mon Sep 17 00:00:00 2001
From: Garrett Campbell <gcampbell@microsoft.com>
Date: Thu, 10 Oct 2024 09:20:27 -0400
Subject: [PATCH] update changelog and change if statement order

---
 CHANGELOG.md | 5 ++++-
 src/proc.ts  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ebfda0d8..7b51210b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ Features:
 
 - Add support for Presets v9, which enables more macro expansion for the `include` field. [#3946](https://github.com/microsoft/vscode-cmake-tools/issues/3946)
 
+Improvements:
+
+- Ensure that any uses of `proc.spawn` work, especially for .bat and .cmd files, due to VS Code updating to Node 20. [#4037](https://github.com/microsoft/vscode-cmake-tools/issues/4037)
+
 Bug Fixes:
 
 - Fix issue where duplicate presets are being listed in dropdown. [#4104](https://github.com/microsoft/vscode-cmake-tools/issues/4104)
@@ -15,7 +19,6 @@ Bug Fixes:
 Improvements:
 
 - Update signing to support VSCode extension signing. [#4055](https://github.com/microsoft/vscode-cmake-tools/pull/4055)
-- Ensure that any uses of `proc.spawn` work, especially for .bat and .cmd files, due to VS Code updating to Node 20. [#4037](https://github.com/microsoft/vscode-cmake-tools/issues/4037)
 
 ## 1.19.51
 
diff --git a/src/proc.ts b/src/proc.ts
index 0016ea898..1c042412c 100644
--- a/src/proc.ts
+++ b/src/proc.ts
@@ -159,7 +159,7 @@ export function execute(command: string, args?: string[], outputConsumer?: Outpu
         }
     }
 
-    if (options.shell === undefined && process.platform === "win32") {
+    if (process.platform === "win32" && options.shell === undefined) {
         options.shell = determineShell(command);
     }