fix merge errors

src/backend/downloadmanager/downloadqueue.ts

@@ -1,4 +1,4 @@
-import { libraryManagerMap } from 'backend/storeManagers'
+import { gameManagerMap, libraryManagerMap } from 'backend/storeManagers'
 import { TypeCheckedStoreBackend } from './../electron_store'
 import { logError, logInfo, LogPrefix, logWarning } from '../logger/logger'
 import { getFileSize } from '../utils'
@@ -185,8 +185,8 @@ function cancelCurrentDownload({ removeDownloaded = false }) {
 
     if (removeDownloaded) {
       const { appName, runner } = currentElement!.params
-      const { folder_name } = getGame(appName, runner).getGameInfo()
-      removeFolder(currentElement.params.path, folder_name)
+      const { folder_name } = gameManagerMap[runner].getGameInfo(appName)
+      if (folder_name) removeFolder(currentElement.params.path, folder_name)
     }
     currentElement = null
   }
@@ -211,14 +211,15 @@ function resumeCurrentDownload() {
 function stopCurrentDownload() {
   const { appName, runner } = currentElement!.params
   callAbortController(appName)
-  getGame(appName, runner).stop(false)
+  gameManagerMap[runner].stop(appName, false)
 }
 
 // notify the user based on the status of the element and the status of the queue
 function processNotification(element: DMQueueElement, status: DMStatus) {
   const action = element.type === 'install' ? 'Installation' : 'Update'
-  const game = getGame(element.params.appName, element.params.runner)
-  const { title } = game.getGameInfo()
+  const { title } = gameManagerMap[element.params.runner].getGameInfo(
+    element.params.appName
+  )
 
   if (status === 'abort') {
     if (isPaused()) {

src/backend/downloadmanager/utils.ts

@@ -1,7 +1,7 @@
 import { gameManagerMap } from 'backend/storeManagers'
 import { logError, LogPrefix, logWarning } from '../logger/logger'
 import { isEpicServiceOffline } from '../utils'
-import { DMStatus, InstallParams, InstallPlatform } from 'common/types'
+import { DMStatus, InstallParams } from 'common/types'
 import i18next from 'i18next'
 import { notify, showDialogBoxModalAuto } from '../dialog/dialog'
 import { isOnline } from '../online_monitor'
@@ -65,15 +65,13 @@ async function installQueueElement(params: InstallParams): Promise<{
   }
 
   try {
-    const installPlatform = platformToInstall as InstallPlatform
-    const installInstance = async () =>
-      gameManagerMap[runner].install(appName, {
-        path: path.replaceAll("'", ''),
-        installDlcs,
-        sdlList,
-        platformToInstall: installPlatform,
-        installLanguage
-      })
+    const { status, error } = await gameManagerMap[runner].install(appName, {
+      path: path.replaceAll("'", ''),
+      installDlcs,
+      sdlList,
+      platformToInstall,
+      installLanguage
+    })
 
     if (status === 'error') {
       errorMessage(error ?? '')

src/backend/storeManagers/gog/games.ts

@@ -22,7 +22,8 @@ import {
   killPattern,
   spawnAsync,
   moveOnUnix,
-  moveOnWindows
+  moveOnWindows,
+  shutdownWine
 } from '../../utils'
 import {
   ExtraInfo,
@@ -834,9 +835,14 @@ export async function forceUninstall(appName: string): Promise<void> {
 
 // Could be removed if gogdl handles SIGKILL and SIGTERM for us
 // which is send via AbortController
-export async function stop(appName: string): Promise<void> {
+export async function stop(appName: string, stopWine = true): Promise<void> {
   const pattern = isLinux ? appName : 'gogdl'
   killPattern(pattern)
+
+  if (stopWine && !isNative(appName) && isLinux) {
+    const gameSettings = await getSettings(appName)
+    await shutdownWine(gameSettings)
+  }
 }
 
 export function isGameAvailable(appName: string) {

src/backend/storeManagers/legendary/games.ts

@@ -29,7 +29,8 @@ import {
   getLegendaryBin,
   killPattern,
   moveOnUnix,
-  moveOnWindows
+  moveOnWindows,
+  shutdownWine
 } from '../../utils'
 import {
   isMac,
@@ -964,13 +965,18 @@ export async function forceUninstall(appName: string) {
 
 // Could be removed if legendary handles SIGKILL and SIGTERM for us
 // which is send via AbortController
-export async function stop(appName: string) {
+export async function stop(appName: string, stopWine = true) {
   // until the legendary bug gets fixed, kill legendary on mac
   // not a perfect solution but it's the only choice for now
 
   // @adityaruplaha: this is kinda arbitary and I don't understand it.
   const pattern = process.platform === 'linux' ? appName : 'legendary'
   killPattern(pattern)
+
+  if (stopWine && isNative(appName)) {
+    const gameSettings = await getSettings(appName)
+    await shutdownWine(gameSettings)
+  }
 }
 
 export function isGameAvailable(appName: string) {

src/common/types/game_manager.ts

@@ -55,7 +55,7 @@ export interface GameManager {
   uninstall: (args: RemoveArgs) => Promise<ExecResult>
   update: (appName: string) => Promise<InstallResult>
   forceUninstall: (appName: string) => Promise<void>
-  stop: (appName: string) => Promise<void>
+  stop: (appName: string, stopWine?: boolean) => Promise<void>
   isGameAvailable: (appName: string) => boolean
 }
 

src/frontend/types.ts

@@ -8,7 +8,6 @@ import {
   ButtonOptions,
   LibraryTopSectionOptions,
   DMQueueElement,
-  SideloadGame,
   DownloadManagerState
 } from 'common/types'