From e6840049b6847370be563db6098fabc2b65e07a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 26 Jun 2024 14:29:53 +0300
Subject: [PATCH] Fix inadvertently skipping conflict resolution

Wrong argument passed to Vuex action silently skipped calling
ConflictManagementProvider.resolveConflicts()
---
 src/store/modules/ProfileModule.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/ProfileModule.ts b/src/store/modules/ProfileModule.ts
index 61ce198f2..2baee0832 100644
--- a/src/store/modules/ProfileModule.ts
+++ b/src/store/modules/ProfileModule.ts
@@ -216,7 +216,7 @@ export default {
             }
 
             // IDK but sounds important.
-            await dispatch('resolveConflicts', lastSuccessfulUpdate);
+            await dispatch('resolveConflicts', params);
         },
 
         async enableModsOnActiveProfile(
@@ -270,7 +270,7 @@ export default {
                 }
             }
 
-            await dispatch('resolveConflicts', lastSuccessfulUpdate);
+            await dispatch('resolveConflicts', params);
         },
 
         async loadLastSelectedProfile({commit, rootGetters}): Promise<string> {
@@ -390,7 +390,7 @@ export default {
                 }
             }
 
-            await dispatch('resolveConflicts', lastSuccessfulUpdate);
+            await dispatch('resolveConflicts', params);
         },
 
         async updateActiveProfile({commit, rootGetters}, profileName: string) {