[Fix] Check for game updates before launch (#1335)

* fix: check for updates before launch * fix: pr comments * chore: skip wineboot for proton
Heroic-Games-Launcher · May 18, 2022 · 3cf1c76 · 3cf1c76
1 parent b738081
commit 3cf1c76
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 34 deletions.
diff --git a/electron/launcher.ts b/electron/launcher.ts
@@ -280,7 +280,7 @@ async function verifyWinePrefix(
 ): Promise<{ res: ExecResult; updated: boolean }> {
   const { winePrefix, wineVersion } = await game.getSettings()
 
-  if (wineVersion.type === 'crossover') {
+  if (!(wineVersion.type === 'wine')) {
     return { res: { stdout: '', stderr: '' }, updated: false }
   }
 
@@ -363,7 +363,7 @@ async function runWineCommand(
     // Can't wait if we don't have a Wineserver
     if (wait) {
       if (wineVersion.wineserver) {
-        additional_command = `${wineVersion.wineserver} --wait`
+        additional_command = `"${wineVersion.wineserver}" --wait`
       } else {
         logWarning(
           'Unable to wait on Wine command, no Wineserver!',
@@ -373,7 +373,7 @@ async function runWineCommand(
     }
   }
 
-  let finalCommand = `${wineBin} ${command}`
+  let finalCommand = `"${wineBin}" ${command}`
   if (additional_command) {
     finalCommand += ` && ${additional_command}`
   }
@@ -385,7 +385,7 @@ async function runWineCommand(
       return response
     })
     .catch((error) => {
-      logError(['Error running Wine command:', error], LogPrefix.Legendary)
+      logError(['Error running Wine command:', error], LogPrefix.Backend)
       return { stderr: error, stdout: '' }
     })
 }

diff --git a/electron/legendary/games.ts b/electron/legendary/games.ts
@@ -521,7 +521,7 @@ class LegendaryGame extends Game {
     return res
   }
 
-  public async launch(launchArguments = ''): Promise<LaunchResult> {
+  public async launch(launchArguments: string): Promise<LaunchResult> {
     const gameSettings =
       GameConfig.get(this.appName).config ||
       (await GameConfig.get(this.appName).getSettings())
@@ -572,6 +572,7 @@ class LegendaryGame extends Game {
           steamRuntime
         )
       }
+
       // These options are required on both Windows and Mac
       commandParts = [
         'launch',
@@ -623,7 +624,8 @@ class LegendaryGame extends Game {
         offlineFlag,
         ...wineFlag,
         ...winePrefixFlag,
-        launcherArgs
+        launcherArgs,
+        launchArguments
       ]
     }
     const command = getLegendaryCommand(commandParts, commandEnv, wrappers)

diff --git a/src/helpers/library.ts b/src/helpers/library.ts
@@ -249,43 +249,45 @@ type LaunchOptions = {
   t: TFunction<'gamepage'>
   launchArguments?: string
   runner: Runner
+  hasUpdate: boolean
 }
 
 const launch = async ({
   appName,
   t,
   launchArguments,
-  runner
-}: LaunchOptions): Promise<void> =>
-  ipcRenderer
+  runner,
+  hasUpdate
+}: LaunchOptions): Promise<void> => {
+  if (hasUpdate) {
+    const args = {
+      buttons: [t('gamepage:box.yes'), t('box.no')],
+      message: t('gamepage:box.update.message'),
+      title: t('gamepage:box.update.title')
+    }
+
+    const { response } = await ipcRenderer.invoke('openMessageBox', args)
+
+    if (response === 0) {
+      return updateGame(appName, runner)
+    }
+
+    return ipcRenderer.invoke('launch', {
+      appName,
+      runner,
+      launchArguments: '--skip-version-check'
+    })
+  }
+
+  return ipcRenderer
     .invoke('launch', { appName, launchArguments, runner })
     .then(async (err: string | string[]) => {
       if (!err) {
         return
       }
-
-      if (
-        typeof err === 'string' &&
-        err.includes('ERROR: Game is out of date')
-      ) {
-        const args = {
-          buttons: [t('gamepage:box.yes'), t('box.no')],
-          message: t('gamepage:box.update.message'),
-          title: t('gamepage:box.update.title')
-        }
-
-        const { response } = await ipcRenderer.invoke('openMessageBox', args)
-
-        if (response === 0) {
-          return updateGame(appName, runner)
-        }
-        await ipcRenderer.invoke('launch', {
-          appName,
-          runner,
-          launchArguments: '--skip-version-check'
-        })
-      }
+      return ipcRenderer.invoke('showErrorBox', ['Error', `${err}`])
     })
+}
 
 const updateGame = async (appName: string, runner: Runner): Promise<void> =>
   ipcRenderer.invoke('updateGame', appName, runner)

diff --git a/src/screens/Game/GamePage/index.tsx b/src/screens/Game/GamePage/index.tsx
@@ -536,7 +536,13 @@ export default function GamePage(): JSX.Element | null {
         await syncSaves(savesPath, appName)
         setIsSyncing(false)
       }
-      await launch({ appName, t, launchArguments, runner: gameInfo.runner })
+      await launch({
+        appName,
+        t,
+        launchArguments,
+        runner: gameInfo.runner,
+        hasUpdate
+      })
 
       if (autoSyncSaves) {
         setIsSyncing(true)

diff --git a/src/screens/Library/components/GameCard/index.tsx b/src/screens/Library/components/GameCard/index.tsx
@@ -366,7 +366,7 @@ const GameCard = ({
       return sendKill(appName, runner)
     }
     if (isInstalled) {
-      return launch({ appName, t, runner })
+      return launch({ appName, t, runner, hasUpdate })
     }
     return
   }

diff --git a/src/state/GlobalState.tsx b/src/state/GlobalState.tsx
@@ -461,7 +461,8 @@ export class GlobalState extends PureComponent<Props> {
       )[0]
       if (!currentApp) {
         // Add finding a runner for games
-        return launch({ appName, t, runner })
+        const hasUpdate = this.state.gameUpdates?.includes(appName)
+        return launch({ appName, t, runner, hasUpdate })
       }
     })