From b94fe0a053118188d51c9c4d4dadceb7c93dcba3 Mon Sep 17 00:00:00 2001 From: silentrald Date: Tue, 28 Jan 2025 20:58:24 +0800 Subject: [PATCH] [feat] follow launch command string even if its hidden --- .../create-launch-shortcut-modal.component.tsx | 8 +------- .../slides/launch/launch-slide.component.tsx | 6 +++--- src/renderer/services/bs-launcher.service.ts | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx b/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx index 014c5142..5c44584d 100644 --- a/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx +++ b/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx @@ -31,13 +31,7 @@ export const CreateLaunchShortcutModal: ModalComponent<{ steamShortcut: boolean, }, [data]); const completeModal = () => { - - if(advanced) { - launchOption.command = command.trim(); - } else { - launchOption.command = ""; - } - + launchOption.command = command.trim(); resolver({exitCode: ModalExitCode.COMPLETED, data: { launchOption, steamShortcut }}); } diff --git a/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx b/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx index 1eb75078..472e2086 100644 --- a/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx +++ b/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx @@ -38,7 +38,7 @@ export function LaunchSlide({ version }: Props) { const versions = useService(BSVersionManagerService); const [advancedLaunch, setAdvancedLaunch] = useState(false); - const [command, setCommand] = useState(configService.get("additionnal-args") || ""); + const [command, setCommand] = useState(configService.get("launch-command") || ""); const versionDownloading = useObservable(() => bsDownloader.downloadingVersion$); const [activeLaunchMods, setActiveLaunchMods] = useState(configService.get("launch-mods") ?? []); const [pinnedLaunchMods, setPinnedLaunchMods] = useState(configService.get("pinned-launch-mods" as DefaultConfigKey) ?? []); @@ -46,7 +46,7 @@ export function LaunchSlide({ version }: Props) { const versionRunning = useObservable(() => bsLauncherService.versionRunning$); useEffect(() => { - configService.set("additionnal-args", command); + configService.set("launch-command", command); }, [command]); useEffect(() => { @@ -149,7 +149,7 @@ export function LaunchSlide({ version }: Props) { const launch$ = bsLauncherService.launch({ version, launchMods: activeLaunchMods, - command: advancedLaunch ? command : "", + command, }); return lastValueFrom(launch$).catch(() => {}); diff --git a/src/renderer/services/bs-launcher.service.ts b/src/renderer/services/bs-launcher.service.ts index 357399b5..8c630c95 100644 --- a/src/renderer/services/bs-launcher.service.ts +++ b/src/renderer/services/bs-launcher.service.ts @@ -40,7 +40,7 @@ export class BSLauncherService { return { version, launchMods: this.config.get("launch-mods") ?? [], - command: this.config.get("additionnal-args") || "", + command: this.config.get("launch-command") || "", } }