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

anttimaki · web-flow · commit 71890ddd0c71 · 2024-08-13T16:33:35.000+03:00
Fix inadvertently skipping conflict resolution
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) {

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ export default {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`// IDK but sounds important.`
`219`		`- await dispatch('resolveConflicts', lastSuccessfulUpdate);`
	`219`	`+ await dispatch('resolveConflicts', params);`
`220`	`220`	`},`
`221`	`221`
`222`	`222`	`async enableModsOnActiveProfile(`
`@@ -270,7 +270,7 @@ export default {`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
`273`		`- await dispatch('resolveConflicts', lastSuccessfulUpdate);`
	`273`	`+ await dispatch('resolveConflicts', params);`
`274`	`274`	`},`
`275`	`275`
`276`	`276`	`async loadLastSelectedProfile({commit, rootGetters}): Promise<string> {`
`@@ -390,7 +390,7 @@ export default {`
`390`	`390`	`}`
`391`	`391`	`}`
`392`	`392`
`393`		`- await dispatch('resolveConflicts', lastSuccessfulUpdate);`
	`393`	`+ await dispatch('resolveConflicts', params);`
`394`	`394`	`},`
`395`	`395`
`396`	`396`	`async updateActiveProfile({commit, rootGetters}, profileName: string) {`