[Fix] cleanup discord rpc on launch failures (#3888)

Heroic-Games-Launcher · Jul 28, 2024 · 5fc4c8d · 5fc4c8d
1 parent 8465488
commit 5fc4c8d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/backend/storeManagers/gog/games.ts b/src/backend/storeManagers/gog/games.ts
@@ -499,6 +499,7 @@ export async function launch(
   } = await prepareLaunch(gameSettings, gameInfo, isNative(appName))
   if (!launchPrepSuccess) {
     appendGamePlayLog(gameInfo, `Launch aborted: ${launchPrepFailReason}`)
+    launchCleanup()
     showDialogBoxModalAuto({
       title: t('box.error.launchAborted', 'Launch aborted'),
       message: launchPrepFailReason!,
@@ -685,6 +686,8 @@ export async function launch(
     }
   })
 
+  launchCleanup(rpcClient)
+
   if (abort) {
     return true
   }
@@ -693,8 +696,6 @@ export async function launch(
     logError(['Error launching game:', error], LogPrefix.Gog)
   }
 
-  launchCleanup(rpcClient)
-
   return !error
 }
 

diff --git a/src/backend/storeManagers/legendary/games.ts b/src/backend/storeManagers/legendary/games.ts
@@ -853,6 +853,7 @@ export async function launch(
   } = await prepareLaunch(gameSettings, gameInfo, isNative(appName))
   if (!launchPrepSuccess) {
     appendGamePlayLog(gameInfo, `Launch aborted: ${launchPrepFailReason}`)
+    launchCleanup()
     showDialogBoxModalAuto({
       title: t('box.error.launchAborted', 'Launch aborted'),
       message: launchPrepFailReason!,

diff --git a/src/backend/storeManagers/nile/games.ts b/src/backend/storeManagers/nile/games.ts
@@ -323,6 +323,7 @@ export async function launch(
 
   if (!launchPrepSuccess) {
     appendGamePlayLog(gameInfo, `Launch aborted: ${launchPrepFailReason}`)
+    launchCleanup()
     showDialogBoxModalAuto({
       title: t('box.error.launchAborted', 'Launch aborted'),
       message: launchPrepFailReason!,

diff --git a/src/backend/storeManagers/storeManagerCommon/games.ts b/src/backend/storeManagers/storeManagerCommon/games.ts
@@ -179,6 +179,7 @@ export async function launchGame(
 
     if (!launchPrepSuccess) {
       appendGamePlayLog(gameInfo, `Launch aborted: ${launchPrepFailReason}`)
+      launchCleanup()
       showDialogBoxModalAuto({
         title: i18next.t('box.error.launchAborted', 'Launch aborted'),
         message: launchPrepFailReason!,