Merge branch 'main' into chore/bump-upload-artifact-action

1 files changed, 15 insertions, 7 deletions

diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index a1a67e2b..b61ac573 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -15,6 +15,7 @@ import { router } from "../main";
 import { ReleaseInfo } from "../../../src-tauri/bindings/ReleaseInfo";
 import { ThunderstoreMod } from "../../../src-tauri/bindings/ThunderstoreMod";
 import { NorthstarMod } from "../../../src-tauri/bindings/NorthstarMod";
+import { NorthstarLaunchOptions } from "../../../src-tauri/bindings/NorthstarLaunchOptions"
 import { searchModule } from './modules/search';
 import { i18n } from '../main';
 import { pullRequestModule } from './modules/pull_requests';
@@ -172,9 +173,10 @@ export const store = createStore<FlightCoreStore>({
                 }
             }
         },
-        async launchGame(state: any, no_checks = false) {
-            if (no_checks) {
-                await invoke("launch_northstar", { gameInstall: state.game_install, bypassChecks: no_checks })
+        async launchGame(state: any, launch_options: NorthstarLaunchOptions = { launch_via_steam: false, bypass_checks: false}) {
+
+            if (launch_options.bypass_checks) {
+                await invoke("launch_northstar", { gameInstall: state.game_install, launchOptions: launch_options })
                     .then((message) => {
                         console.log("Launched with bypassed checks");
                         console.log(message);
@@ -224,7 +226,7 @@ export const store = createStore<FlightCoreStore>({
 
                 // Game is ready to play.
                 case NorthstarState.READY_TO_PLAY:
-                    await invoke("launch_northstar", { gameInstall: state.game_install })
+                    await invoke("launch_northstar", { gameInstall: state.game_install, launchOptions: launch_options })
                         .then((message) => {
                             console.log(message);
                             // NorthstarState.RUNNING
@@ -240,8 +242,8 @@ export const store = createStore<FlightCoreStore>({
                     break;
             }
         },
-        async launchGameSteam(state: any, no_checks = false) {
-            await invoke("launch_northstar", { gameInstall: state.game_install, launchViaSteam: true, bypassChecks: no_checks })
+        async launchGameSteam(state: any, launch_options: NorthstarLaunchOptions = { launch_via_steam: true, bypass_checks: false}) {
+            await invoke("launch_northstar", { gameInstall: state.game_install, launchOptions: launch_options })
                 .then((message) => {
                     showNotification('Success');
                 })
@@ -254,7 +256,13 @@ export const store = createStore<FlightCoreStore>({
         },
         async fetchReleaseNotes(state: FlightCoreStore) {
             if (state.releaseNotes.length !== 0) return;
-            state.releaseNotes = await invoke("get_northstar_release_notes");
+            await invoke<ReleaseInfo[]>("get_northstar_release_notes")
+                .then((message) => {
+                    state.releaseNotes = message;
+                })
+                .catch((error) => {
+                    showErrorNotification(error);
+                });
         },
         async fetchThunderstoreMods(state: FlightCoreStore) {
             // To check if some Thunderstore mods are already installed/outdated, we need to load locally-installed mods.