Merge branch 'main' into feat/launch-parameters

2 files changed, 4 insertions, 26 deletions

diff --git a/src-vue/src/components/LocalModCard.vue b/src-vue/src/components/LocalModCard.vue
index dd3629f8..f8d0256d 100644
--- a/src-vue/src/components/LocalModCard.vue
+++ b/src-vue/src/components/LocalModCard.vue
@@ -30,7 +30,6 @@
 import { defineComponent } from "vue";
 import { invoke } from "@tauri-apps/api";
 import { NorthstarMod } from "../../../src-tauri/bindings/NorthstarMod";
-import { GameInstall } from "../utils/GameInstall";
 import { showErrorNotification, showNotification } from "../utils/ui";
 
 export default defineComponent({
@@ -50,16 +49,10 @@ export default defineComponent({
         async updateWhichModsEnabled(mod: NorthstarMod) {
             this.global_load_indicator = true;
 
-            // Setup up struct
-            let game_install = {
-                game_path: this.$store.state.game_path,
-                install_type: this.$store.state.install_type
-            } as GameInstall;
-
             // enable/disable specific mod
             try {
                 await invoke("set_mod_enabled_status", {
-                    gameInstall: game_install,
+                    gameInstall: this.$store.state.game_install,
                     modName: mod.name,
                     // Need to set it to the opposite of current state,
                     // as current state is only updated after command is run
@@ -76,11 +69,7 @@ export default defineComponent({
             return true;
         },
         async deleteMod(mod: NorthstarMod) {
-            let game_install = {
-                game_path: this.$store.state.game_path,
-                install_type: this.$store.state.install_type
-            } as GameInstall;
-            await invoke("delete_northstar_mod", { gameInstall: game_install, nsmodName: mod.name })
+            await invoke("delete_northstar_mod", { gameInstall: this.$store.state.game_install, nsmodName: mod.name })
                 .then((message) => {
                     // Just a visual indicator that it worked
                     showNotification(this.$t('mods.local.success_deleting', { modName: mod.name }));
diff --git a/src-vue/src/components/ThunderstoreModCard.vue b/src-vue/src/components/ThunderstoreModCard.vue
index 2fbbac40..30ffbc68 100644
--- a/src-vue/src/components/ThunderstoreModCard.vue
+++ b/src-vue/src/components/ThunderstoreModCard.vue
@@ -71,7 +71,6 @@ import { ThunderstoreModVersion } from "../../../src-tauri/bindings/Thunderstore
 import { invoke, shell } from "@tauri-apps/api";
 import { ThunderstoreModStatus } from "../utils/thunderstore/ThunderstoreModStatus";
 import { NorthstarMod } from "../../../src-tauri/bindings/NorthstarMod";
-import { GameInstall } from "../utils/GameInstall";
 import { NorthstarState } from "../utils/NorthstarState";
 import { ElMessageBox } from "element-plus";
 import { showErrorNotification, showNotification } from "../utils/ui";
@@ -217,12 +216,7 @@ export default defineComponent({
                 }
             )
                 .then(async () => { // Deletion confirmed
-                    let game_install = {
-                        game_path: this.$store.state.game_path,
-                        install_type: this.$store.state.install_type
-                    } as GameInstall;
-
-                    await invoke<string>("delete_thunderstore_mod", { gameInstall: game_install, thunderstoreModString: this.latestVersion.full_name })
+                    await invoke<string>("delete_thunderstore_mod", { gameInstall: this.$store.state.game_install, thunderstoreModString: this.latestVersion.full_name })
                         .then((message) => {
                             showNotification(this.$t('mods.card.remove_success', { modName: mod.name }), message);
                         })
@@ -239,11 +233,6 @@ export default defineComponent({
         },
 
         async installMod(mod: ThunderstoreMod) {
-            let game_install = {
-                game_path: this.$store.state.game_path,
-                install_type: this.$store.state.install_type
-            } as GameInstall;
-
             // set internal state according to current installation state
             if (this.modStatus === ThunderstoreModStatus.OUTDATED) {
                 this.isBeingUpdated = true;
@@ -254,7 +243,7 @@ export default defineComponent({
             // Capture translation method in a context, so it can be used outside Vue component context.
             // (see https://github.com/R2NorthstarTools/FlightCore/issues/384)
             (async (translate: Function) => {
-                await invoke<string>("install_mod_caller", { gameInstall: game_install, thunderstoreModString: this.latestVersion.full_name }).then((message) => {
+                await invoke<string>("install_mod_caller", { gameInstall: this.$store.state.game_install, thunderstoreModString: this.latestVersion.full_name }).then((message) => {
                 showNotification(translate('mods.card.install_success', { modName: mod.name }), message);
             })
                 .catch((error) => {