Merge pull request #54738 from nextcloud/fix-resolve-conflict-with-dragndrop-upload

2025-09-01 15:13:38 +07:00 · 2025-09-01 15:13:38 +07:00 · 796eec5962
parent 61bb2dca40 7d8735f48b
commit 796eec5962
3 changed files with 4 additions and 4 deletions
--- a/apps/files/src/services/DropServiceUtils.ts
+++ b/apps/files/src/services/DropServiceUtils.ts
@ -158,7 +158,7 @@ export const resolveConflict = async <T extends ((Directory|File)|Node)>(files:
 		logger.debug('Conflict resolution', { uploads, selected, renamed })

 		// If the user selected nothing, we cancel the upload
-		if (selected.length === 0 && renamed.length === 0) {
+		if (selected.length === 0 && renamed.length === 0 && uploads.length === 0) {
 			// User skipped
 			showInfo(t('files', 'Conflicts resolution skipped'))
 			logger.info('User skipped the conflict resolution')
--- a/dist/files-main.js
+++ b/dist/files-main.js
--- a/dist/files-main.js.map
+++ b/dist/files-main.js.map