From 3ebfe9511b81f2b60e1691d20b13e901ab8715e0 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Mon, 8 Jul 2024 11:15:54 +0200 Subject: fix: stop file actions when conflict dialog skipped Signed-off-by: grnd-alt --- apps/files/src/actions/moveOrCopyAction.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'apps/files/src') diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts index 5d3a7afa0e2..f4e3c6b29eb 100644 --- a/apps/files/src/actions/moveOrCopyAction.ts +++ b/apps/files/src/actions/moveOrCopyAction.ts @@ -128,11 +128,8 @@ export const handleCopyMoveNodeTo = async (node: Node, destination: Folder, meth try { // Let the user choose what to do with the conflicting files const { selected, renamed } = await openConflictPicker(destination.path, [node], otherNodes.contents) - // 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 + // two empty arrays: either only old files or conflict skipped -> no action required if (!selected.length && !renamed.length) { - await client.deleteFile(currentPath) - emit('files:node:deleted', node) return } } catch (error) { -- cgit v1.2.3