From bc65bf8d19b0d2fc91444bf36a07f91fb9decbb6 Mon Sep 17 00:00:00 2001 From: Etaash Mathamsetty Date: Fri, 14 Apr 2023 22:13:30 -0400 Subject: [PATCH 1/3] fix non-native sideloads (again) --- src/backend/storeManagers/storeManagerCommon/games.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/backend/storeManagers/storeManagerCommon/games.ts b/src/backend/storeManagers/storeManagerCommon/games.ts index 8e2aef0db2..a6ab9b24c5 100644 --- a/src/backend/storeManagers/storeManagerCommon/games.ts +++ b/src/backend/storeManagers/storeManagerCommon/games.ts @@ -184,6 +184,12 @@ export async function launchGame( LogPrefix.Backend ) + sendFrontendMessage('gameStatusUpdate', { + appName: appName, + runner: 'sideload', + status: 'playing' + }) + await runWineCommand({ commandParts: [executable, launcherArgs ?? ''], gameSettings, From f643f1feba510d98c8d8746ebc640828227ae0ba Mon Sep 17 00:00:00 2001 From: Etaash Mathamsetty Date: Fri, 14 Apr 2023 22:56:58 -0400 Subject: [PATCH 2/3] fix bugs --- src/backend/main.ts | 6 ++++++ src/backend/storeManagers/storeManagerCommon/games.ts | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/main.ts b/src/backend/main.ts index ac24b9c445..967c2fbb3e 100644 --- a/src/backend/main.ts +++ b/src/backend/main.ts @@ -995,6 +995,12 @@ ipcMain.handle( } } + sendFrontendMessage('gameStatusUpdate', { + appName, + runner, + status: 'playing' + }) + const command = gameManagerMap[runner].launch(appName, launchArguments) const launchResult = await command.catch((exception) => { diff --git a/src/backend/storeManagers/storeManagerCommon/games.ts b/src/backend/storeManagers/storeManagerCommon/games.ts index a6ab9b24c5..c8ba277e07 100644 --- a/src/backend/storeManagers/storeManagerCommon/games.ts +++ b/src/backend/storeManagers/storeManagerCommon/games.ts @@ -148,7 +148,7 @@ export async function launchGame( sendFrontendMessage('gameStatusUpdate', { appName: appName, - runner: 'sideload', + runner: runner, status: 'playing' }) @@ -184,12 +184,6 @@ export async function launchGame( LogPrefix.Backend ) - sendFrontendMessage('gameStatusUpdate', { - appName: appName, - runner: 'sideload', - status: 'playing' - }) - await runWineCommand({ commandParts: [executable, launcherArgs ?? ''], gameSettings, From 6dd25a38deaef773b7d86dda87777c48b615b123 Mon Sep 17 00:00:00 2001 From: Etaash Mathamsetty Date: Fri, 14 Apr 2023 23:02:16 -0400 Subject: [PATCH 3/3] remove useless code --- src/backend/storeManagers/storeManagerCommon/games.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/backend/storeManagers/storeManagerCommon/games.ts b/src/backend/storeManagers/storeManagerCommon/games.ts index c8ba277e07..1955b68031 100644 --- a/src/backend/storeManagers/storeManagerCommon/games.ts +++ b/src/backend/storeManagers/storeManagerCommon/games.ts @@ -19,7 +19,6 @@ import { showDialogBoxModalAuto } from '../../dialog/dialog' import { createAbortController } from '../../utils/aborthandler/aborthandler' import { app, BrowserWindow } from 'electron' import { gameManagerMap } from '../index' -import { sendFrontendMessage } from 'backend/main_window' const buildDir = resolve(__dirname, '../../build') async function getAppSettings(appName: string): Promise { @@ -146,12 +145,6 @@ export async function launchGame( } } - sendFrontendMessage('gameStatusUpdate', { - appName: appName, - runner: runner, - status: 'playing' - }) - const commandParts = shlex.split(launcherArgs ?? '') await callRunner(