From ff4f7ab579ebd8616be2c162e18c884c1119b908 Mon Sep 17 00:00:00 2001
From: Ariel Juodziukynas <arieljuod@gmail.com>
Date: Sat, 29 Jul 2023 11:42:20 -0300
Subject: [PATCH] Store current command promise after callbacks are added

---
 src/backend/launcher.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts
index 6269a194eb..b6801d53f3 100644
--- a/src/backend/launcher.ts
+++ b/src/backend/launcher.ts
@@ -781,7 +781,7 @@ async function callRunner(
     return currentPromise
   }
 
-  const promise = new Promise<ExecResult>((res, rej) => {
+  let promise = new Promise<ExecResult>((res, rej) => {
     const child = spawn(bin, commandParts, {
       cwd: runner.dir,
       env: { ...process.env, ...options?.env },
@@ -852,10 +852,7 @@ async function callRunner(
     })
   })
 
-  // keep track of which commands are running
-  commandsRunning[key] = promise
-
-  promise
+  promise = promise
     .then(({ stdout, stderr }) => {
       return { stdout, stderr, fullCommand: safeCommand }
     })
@@ -894,6 +891,9 @@ async function callRunner(
       delete commandsRunning[key]
     })
 
+  // keep track of which commands are running
+  commandsRunning[key] = promise
+
   return promise
 }