diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt index 7ee9cb13cb..cd8105aad6 100644 --- a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt +++ b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt @@ -247,11 +247,8 @@ class PreparePasteTask(strongRefMain: MainActivity) { while (iterator.hasNext()) { val hybridFileParcelable = iterator.next() copyDialogBinding.fileNameText.text = hybridFileParcelable.name + dialogBuilder.cancelable(hybridFileParcelable.getParent(context.get()) == targetPath) val dialog = dialogBuilder.build() - if (hybridFileParcelable.getParent(context.get()) == targetPath) { - dialog.getActionButton(DialogAction.NEGATIVE) - .isEnabled = false - } val resultDeferred = CompletableDeferred() dialogBuilder.onPositive { _, _ -> resultDeferred.complete(DialogAction.POSITIVE) @@ -262,6 +259,13 @@ class PreparePasteTask(strongRefMain: MainActivity) { dialogBuilder.onNeutral { _, _ -> resultDeferred.complete(DialogAction.NEUTRAL) } + if (hybridFileParcelable.getParent(context.get()) == targetPath) { + dialog.setOnCancelListener { + resultDeferred.complete(DialogAction.NEUTRAL) + } + dialog.getActionButton(DialogAction.NEGATIVE) + .isEnabled = false + } dialog.show() when (resultDeferred.await()) { DialogAction.POSITIVE -> {