From 0b24a5ceb279ae0cb0e6ed4afe1dc1c1ce8de7a5 Mon Sep 17 00:00:00 2001
From: slinky <49608195+slinkstr@users.noreply.github.com>
Date: Sat, 3 Feb 2024 22:21:00 -0800
Subject: [PATCH] [bugfix-416] Wait for SteamVR folder rename before exit

---
 .../services/bs-launcher/steam-launcher.service.ts  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/services/bs-launcher/steam-launcher.service.ts b/src/main/services/bs-launcher/steam-launcher.service.ts
index b0d18a63..538993e4 100644
--- a/src/main/services/bs-launcher/steam-launcher.service.ts
+++ b/src/main/services/bs-launcher/steam-launcher.service.ts
@@ -123,13 +123,16 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto
                 })
             );
 
-            await launchPromise.then(exitCode => {
+            try {
+                const exitCode = await launchPromise;
                 log.info("BS process exit code", exitCode);
-            }).catch(err => {
+            }
+            catch(err: any) {
                 throw CustomError.fromError(err, BSLaunchError.BS_EXIT_ERROR);
-            }).finally(() => {
-                this.restoreSteamVR().catch(log.error);
-            });
+            }
+            finally {
+                await this.restoreSteamVR().catch(log.error);
+            }
 
         })().then(() => {
             obs.complete();