Merge pull request ebkr#1386 from ebkr/fix-conflict-resolution

Fix inadvertently skipping conflict resolution
thunderstore-io · Aug 13, 2024 · 71890dd · 71890dd
2 parents ca35974 + e684004
commit 71890dd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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) {