From e182a2dfa57a4e06a796014294760eb7ab20a2d7 Mon Sep 17 00:00:00 2001
From: Flavio F Lima <flavioislima@gmail.com>
Date: Sat, 28 May 2022 14:51:22 +0200
Subject: [PATCH 1/5] fix: remove unecessary dialogs

---
 electron/launcher.ts  | 7 -------
 electron/shortcuts.ts | 6 ++++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/electron/launcher.ts b/electron/launcher.ts
index cbc2228e32..7fcef8f518 100644
--- a/electron/launcher.ts
+++ b/electron/launcher.ts
@@ -525,13 +525,6 @@ async function runLegendaryOrGogdlCommand(
         runner: runner.name
       })
 
-      if (
-        stderr.join().includes('ERROR') ||
-        stderr.join().includes('CRITICAL')
-      ) {
-        rej(stderr.join())
-      }
-
       if (signal) {
         rej('Process terminated with signal ' + signal)
       }
diff --git a/electron/shortcuts.ts b/electron/shortcuts.ts
index fc519f999d..03173013af 100644
--- a/electron/shortcuts.ts
+++ b/electron/shortcuts.ts
@@ -74,7 +74,8 @@ Categories=Game;
     default:
       logError(
         "Shortcuts haven't been implemented in the current platform.",
-        LogPrefix.Backend
+        LogPrefix.Backend,
+        false
       )
   }
 }
@@ -120,7 +121,8 @@ function shortcutFiles(gameTitle: string) {
     default:
       logError(
         "Shortcuts haven't been implemented in the current platform.",
-        LogPrefix.Backend
+        LogPrefix.Backend,
+        false
       )
   }
 

From 8dd874847ff82ba90af4c12f24eaadbafdb3e315 Mon Sep 17 00:00:00 2001
From: Flavio F Lima <flavioislima@gmail.com>
Date: Sat, 28 May 2022 15:10:37 +0200
Subject: [PATCH 2/5] other: make wineprefix absolute path

---
 electron/gog/games.ts       | 7 +++++--
 electron/legendary/games.ts | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/electron/gog/games.ts b/electron/gog/games.ts
index 90e8c76ebb..a0c42ab1dc 100644
--- a/electron/gog/games.ts
+++ b/electron/gog/games.ts
@@ -23,7 +23,8 @@ import {
   isWindows,
   execOptions,
   isMac,
-  isLinux
+  isLinux,
+  userHome
 } from '../constants'
 import { configStore, installedGamesStore } from '../gog/electronStores'
 import { logError, logInfo, LogPrefix, logWarning } from '../logger/logger'
@@ -364,7 +365,9 @@ class GOGGame extends Game {
       const { wineVersion, winePrefix, launcherArgs, useSteamRuntime } =
         gameSettings
       let wineFlag = ['--wine', wineVersion.bin]
-      let winePrefixFlag = ['--wine-prefix', winePrefix]
+
+      // avoid breaking on old configs when path is not absolute
+      let winePrefixFlag = ['--wine-prefix', winePrefix.replace('~/', userHome)]
       if (wineVersion.type === 'proton') {
         const runtime = useSteamRuntime ? getSteamRuntime('soldier') : null
 
diff --git a/electron/legendary/games.ts b/electron/legendary/games.ts
index 2373e3568c..7fa6a87ae6 100644
--- a/electron/legendary/games.ts
+++ b/electron/legendary/games.ts
@@ -629,7 +629,9 @@ class LegendaryGame extends Game {
           : wineVersion.bin
 
       let wineFlag = ['--wine', wineBin]
-      let winePrefixFlag = ['--wine-prefix', winePrefix]
+
+      // avoid breaking on old configs when path is not absolute
+      let winePrefixFlag = ['--wine-prefix', winePrefix.replace('~/', userHome)]
       if (wineVersion.type === 'proton') {
         const runtime = useSteamRuntime ? getSteamRuntime('soldier') : null
 

From a97292f6a8c854509e71946ba1e90db05a33d5f3 Mon Sep 17 00:00:00 2001
From: Flavio F Lima <flavioislima@gmail.com>
Date: Sat, 28 May 2022 15:10:50 +0200
Subject: [PATCH 3/5] chore: css fixes

---
 src/components/UI/SelectField/index.css                | 3 ---
 src/screens/Settings/components/SyncSaves/index.tsx    | 1 +
 src/screens/Settings/components/WineSettings/index.tsx | 2 +-
 src/screens/Settings/index.css                         | 6 ++++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/UI/SelectField/index.css b/src/components/UI/SelectField/index.css
index 6eee5c2974..bd19472226 100644
--- a/src/components/UI/SelectField/index.css
+++ b/src/components/UI/SelectField/index.css
@@ -102,9 +102,6 @@
 }
 
 .selectFieldWrapper button {
-  min-width: 130px;
-  max-width: 50%;
   align-self: center;
   justify-self: center;
-  margin: 12px;
 }
diff --git a/src/screens/Settings/components/SyncSaves/index.tsx b/src/screens/Settings/components/SyncSaves/index.tsx
index 80c0c74d24..bedbe9a542 100644
--- a/src/screens/Settings/components/SyncSaves/index.tsx
+++ b/src/screens/Settings/components/SyncSaves/index.tsx
@@ -133,6 +133,7 @@ export default function SyncSaves({
         onChange={(event) => setSyncType(event.target.value as SyncType)}
         value={syncType}
         disabled={!savesPath.length}
+        extraClass="rightButtons"
         // style={{ marginRight: '12px' }}
         afterSelect={
           <button
diff --git a/src/screens/Settings/components/WineSettings/index.tsx b/src/screens/Settings/components/WineSettings/index.tsx
index 4fbe649c49..944a03bd36 100644
--- a/src/screens/Settings/components/WineSettings/index.tsx
+++ b/src/screens/Settings/components/WineSettings/index.tsx
@@ -206,7 +206,7 @@ export default function WineSettings({
           value={selectedPath}
           onChange={(e) => setSelectedPath(e.target.value)}
           afterSelect={
-            <div className="iconsWrapper rightButtons">
+            <div className="iconsWrapper rightButtons addRemoveSvgButtons">
               <SvgButton onClick={() => removeCustomPath()}>
                 <Tooltip
                   title={t('tooltip.removepath', 'Remove Path') as string}
diff --git a/src/screens/Settings/index.css b/src/screens/Settings/index.css
index 1f0d83dcaa..7f1679b7d3 100644
--- a/src/screens/Settings/index.css
+++ b/src/screens/Settings/index.css
@@ -201,3 +201,9 @@ a {
   flex-direction: column;
   justify-content: center;
 }
+
+.addRemoveSvgButtons button {
+  min-width: none;
+  max-width: none;
+  margin: 0;
+}

From 77f54ef8e24b89a2f1465dfc23b6c39ffff7d830 Mon Sep 17 00:00:00 2001
From: Flavio F Lima <flavioislima@gmail.com>
Date: Sun, 29 May 2022 11:14:02 +0200
Subject: [PATCH 4/5] fix: relative paths on Config

---
 electron/config.ts          |  8 +++++++-
 electron/game_config.ts     | 10 ++++++++--
 electron/gog/games.ts       |  2 +-
 electron/legendary/games.ts |  2 +-
 src/App.css                 |  4 ++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/electron/config.ts b/electron/config.ts
index d848e1b52f..79b79bc86f 100644
--- a/electron/config.ts
+++ b/electron/config.ts
@@ -421,9 +421,15 @@ class GlobalConfigV0 extends GlobalConfig {
 
     try {
       let settings = JSON.parse(readFileSync(heroicConfigPath, 'utf-8'))
+      const defaultSettings = settings.defaultSettings as AppSettings
+
+      // fix relative paths
+      const winePrefix = defaultSettings.winePrefix.replace('~', userHome)
+
       settings = {
         ...(await this.getFactoryDefaults()),
-        ...settings.defaultSettings
+        ...settings.defaultSettings,
+        winePrefix
       } as AppSettings
       return settings
     } catch (error) {
diff --git a/electron/game_config.ts b/electron/game_config.ts
index 3851e2d530..f609854f39 100644
--- a/electron/game_config.ts
+++ b/electron/game_config.ts
@@ -5,7 +5,8 @@ import { GlobalConfig } from './config'
 import {
   currentGameConfigVersion,
   heroicConfigPath,
-  heroicGamesConfigPath
+  heroicGamesConfigPath,
+  userHome
 } from './constants'
 import { logError, logInfo, LogPrefix } from './logger/logger'
 import { join } from 'path'
@@ -201,9 +202,14 @@ class GameConfigV0 extends GameConfig {
       const settings = JSON.parse(readFileSync(this.path, 'utf-8'))
       // Take defaults, then overwrite if explicitly set values exist.
       // The settings defined work as overrides.
+
+      // fix relative paths
+      const { winePrefix } = settings[this.appName] as GameSettings
+
       return {
         ...GlobalConfig.get().config,
-        ...settings[this.appName]
+        ...settings[this.appName],
+        winePrefix: winePrefix.replace('~', userHome)
       } as GameSettings
     } catch (error) {
       logError(
diff --git a/electron/gog/games.ts b/electron/gog/games.ts
index a0c42ab1dc..006f296fe2 100644
--- a/electron/gog/games.ts
+++ b/electron/gog/games.ts
@@ -367,7 +367,7 @@ class GOGGame extends Game {
       let wineFlag = ['--wine', wineVersion.bin]
 
       // avoid breaking on old configs when path is not absolute
-      let winePrefixFlag = ['--wine-prefix', winePrefix.replace('~/', userHome)]
+      let winePrefixFlag = ['--wine-prefix', winePrefix]
       if (wineVersion.type === 'proton') {
         const runtime = useSteamRuntime ? getSteamRuntime('soldier') : null
 
diff --git a/electron/legendary/games.ts b/electron/legendary/games.ts
index 7fa6a87ae6..b7fe960271 100644
--- a/electron/legendary/games.ts
+++ b/electron/legendary/games.ts
@@ -631,7 +631,7 @@ class LegendaryGame extends Game {
       let wineFlag = ['--wine', wineBin]
 
       // avoid breaking on old configs when path is not absolute
-      let winePrefixFlag = ['--wine-prefix', winePrefix.replace('~/', userHome)]
+      let winePrefixFlag = ['--wine-prefix', winePrefix]
       if (wineVersion.type === 'proton') {
         const runtime = useSteamRuntime ? getSteamRuntime('soldier') : null
 
diff --git a/src/App.css b/src/App.css
index 4c0bf51a81..e9c19058a7 100644
--- a/src/App.css
+++ b/src/App.css
@@ -175,9 +175,9 @@ html,
   border: none;
 }
 
-.button.outline:hover {
+.button:hover.outline {
   background: transparent;
-  color: var(--accent-overlay);
+  color: var(--accent-overlay) !important;
   border: 2px solid;
 }
 

From 9484d85b0a7928fb576e71fc3ce82bea1522cb71 Mon Sep 17 00:00:00 2001
From: Flavio F Lima <flavioislima@gmail.com>
Date: Sun, 29 May 2022 11:24:27 +0200
Subject: [PATCH 5/5] fix: active class on wine tools

---
 src/App.css                                     |  3 ++-
 src/screens/Settings/components/Tools/index.tsx | 17 +++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/App.css b/src/App.css
index e9c19058a7..e68c3a39df 100644
--- a/src/App.css
+++ b/src/App.css
@@ -175,7 +175,8 @@ html,
   border: none;
 }
 
-.button:hover.outline {
+.button:hover.outline,
+.button.outline.active {
   background: transparent;
   color: var(--accent-overlay) !important;
   border: 2px solid;
diff --git a/src/screens/Settings/components/Tools/index.tsx b/src/screens/Settings/components/Tools/index.tsx
index 93cc60d98e..4f3f42a6b7 100644
--- a/src/screens/Settings/components/Tools/index.tsx
+++ b/src/screens/Settings/components/Tools/index.tsx
@@ -5,6 +5,7 @@ import React, { useState } from 'react'
 import { IpcRenderer } from 'electron'
 import { WineInstallation } from 'src/types'
 import { useTranslation } from 'react-i18next'
+import classNames from 'classnames'
 
 const { ipcRenderer } = window.require('electron') as {
   ipcRenderer: IpcRenderer
@@ -83,24 +84,16 @@ export default function Tools({ wineVersion, winePrefix, appName }: Props) {
         <div className="toolsWrapper">
           <button
             data-testid="wineCFG"
-            className="button outline"
-            style={{
-              color: winecfgRunning
-                ? 'var(--download-button)'
-                : 'var(--text-default)'
-            }}
+            className={classNames('button outline', { active: winecfgRunning })}
             onClick={async () => callTools('winecfg')}
           >
             <span className="toolTitle">Winecfg</span>
           </button>
           <button
             data-testid="wineTricks"
-            className="button outline"
-            style={{
-              color: winetricksRunning
-                ? 'var(--download-button)'
-                : 'var(--text-default)'
-            }}
+            className={classNames('button outline', {
+              active: winetricksRunning
+            })}
             onClick={async () => callTools('winetricks')}
           >
             <span className="toolTitle">Winetricks</span>