stop file actions when conflict dialog skipped

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>

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) {