From 7da9782aa387b930c784c928c78764aa198b40c1 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Mon, 8 Jul 2024 11:15:54 +0200 Subject: [PATCH] stop file actions when conflict dialog skipped Signed-off-by: grnd-alt --- apps/files/src/actions/moveOrCopyAction.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts index 5d3a7afa0e2f1..eb4328d78d0aa 100644 --- a/apps/files/src/actions/moveOrCopyAction.ts +++ b/apps/files/src/actions/moveOrCopyAction.ts @@ -127,7 +127,10 @@ export const handleCopyMoveNodeTo = async (node: Node, destination: Folder, meth if (hasConflict([node], otherNodes.contents)) { try { // Let the user choose what to do with the conflicting files - const { selected, renamed } = await openConflictPicker(destination.path, [node], otherNodes.contents) + const { selected, renamed, skipped } = await openConflictPicker(destination.path, [node], otherNodes.contents) + if (skipped) { + return + } // if the user selected to keep the old file, and did not select the new file // that means they opted to delete the current node if (!selected.length && !renamed.length) {